mirror of
https://github.com/pulse-browser/browser.git
synced 2024-09-11 20:47:49 +03:00
Merge branch 'alpha' into 102.0
This commit is contained in:
commit
3927c4549f
133
.github/workflows/alpha.yml
vendored
133
.github/workflows/alpha.yml
vendored
@ -8,24 +8,38 @@ jobs:
|
||||
name: Generate build data
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
sha: ${{ steps.data.outputs.shortsha }}
|
||||
build_date: ${{ steps.data.outputs.builddate }}
|
||||
upstream: ${{ steps.data.outputs.upstream }}
|
||||
version: ${{ steps.data.output.version }}
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: Setup melon
|
||||
run: yarn && yarn setupLink
|
||||
- name: Setup gluon
|
||||
run: |
|
||||
yarn
|
||||
yarn setupLink
|
||||
|
||||
cd gluon
|
||||
npm i -g .
|
||||
cd ..
|
||||
|
||||
- name: Bump version
|
||||
run: |
|
||||
gluon ci --brand alpha --bump prerelease
|
||||
|
||||
- name: Export release data
|
||||
id: data
|
||||
shell: bash
|
||||
run: |
|
||||
echo "::set-output name=shortsha::$(git rev-parse --short HEAD)"
|
||||
echo "::set-output name=builddate::$(date +"%Y-%m-%d")"
|
||||
echo "::set-output name=upstream::$(yarn melon ff-version)"
|
||||
echo "::set-output name=version::$(gluon get version | xargs)
|
||||
|
||||
- uses: stefanzweifel/git-auto-commit-action@v4
|
||||
with:
|
||||
commit_message: 🔖 Update version to ${{ steps.data.output.version }}
|
||||
commit_user_name: Fushra Robot
|
||||
commit_user_email: trickypr@gmail.com
|
||||
|
||||
linux:
|
||||
runs-on: ubuntu-latest
|
||||
@ -70,14 +84,6 @@ jobs:
|
||||
run: |
|
||||
echo "ac_add_options --without-wasm-sandboxed-libraries" >> mozconfig
|
||||
|
||||
- name: Use 2 threads to reduce memory usage
|
||||
run: |
|
||||
echo "mk_add_options MOZ_MAKE_FLAGS=\"-j2\"" >> mozconfig
|
||||
|
||||
- name: Use alpha branding
|
||||
run: |
|
||||
echo "ac_add_options --with-branding=browser/branding/alpha" >> mozconfig
|
||||
|
||||
- name: Free up space
|
||||
run: |
|
||||
sudo rm -rf /usr/share/dotnet
|
||||
@ -101,7 +107,7 @@ jobs:
|
||||
continue-on-error: false
|
||||
with:
|
||||
path: /home/runner/.cache/sccache
|
||||
key: ${{ runner.os }}-sccache-${{ needs.build-data.outputs.upstream }}
|
||||
key: ${{ runner.os }}-sccache
|
||||
|
||||
- name: Get System Info
|
||||
run: |
|
||||
@ -111,14 +117,14 @@ jobs:
|
||||
cargo --version
|
||||
ls /opt/wasi-sdk/share/wasi-sysroot
|
||||
|
||||
- name: Log memory usage
|
||||
- name: Setup gluon
|
||||
run: |
|
||||
ps aux | sort -rnk 4
|
||||
yarn && yarn setupLink
|
||||
|
||||
- name: Setup melon
|
||||
run: yarn && yarn setupLink
|
||||
- name: Load gluon CI setup
|
||||
run: yarn gluon ci -- --brand alpha --display-version ${{ needs.build-data.outputs.version }}
|
||||
|
||||
- name: Download firefox source and dependancies
|
||||
- name: Download firefox source and dependencies
|
||||
run: yarn download
|
||||
|
||||
- name: Import
|
||||
@ -134,19 +140,31 @@ jobs:
|
||||
run: yarn build
|
||||
|
||||
- name: Package
|
||||
run: yarn melon package
|
||||
run: yarn package
|
||||
|
||||
- name: Rename artifacts
|
||||
run: |
|
||||
cp ./engine/obj-*/dist/pulse-browser-*.tar.bz2 .
|
||||
mv pulse-browser-*.tar.bz2 "pulse-browser.linux.tar.bz2"
|
||||
mv dist/pulse-browser-*.tar.bz2 "pulse-browser.linux.tar.bz2"
|
||||
mv dist/output.mar linux.mar
|
||||
|
||||
- name: Upload artifact
|
||||
- name: Upload binary
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: pulse-browser.linux.tar.bz2
|
||||
path: ./pulse-browser.linux.tar.bz2
|
||||
|
||||
- name: Upload mar
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: linux.mar
|
||||
path: ./linux.mar
|
||||
|
||||
- name: Upload update manifests
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: linux_update_manifest
|
||||
path: ./dist/update
|
||||
|
||||
mac:
|
||||
runs-on: macos-latest
|
||||
needs: [build-data]
|
||||
@ -177,19 +195,14 @@ jobs:
|
||||
continue-on-error: false
|
||||
with:
|
||||
path: ~/Library/Caches/Mozilla.sccache
|
||||
key: ${{ runner.os }}-sccache-${{ needs.build-data.outputs.upstream }}
|
||||
key: ${{ runner.os }}-sccache
|
||||
|
||||
- name: Use alpha branding
|
||||
run: |
|
||||
echo "ac_add_options --with-branding=browser/branding/alpha" >> mozconfig
|
||||
|
||||
- name: Get System Info
|
||||
run: |
|
||||
cargo --version
|
||||
|
||||
- name: Setup melon
|
||||
- name: Setup gluon
|
||||
run: yarn && yarn setupLink
|
||||
|
||||
- name: Load gluon CI setup
|
||||
run: yarn gluon ci -- --brand alpha --display-version ${{ needs.build-data.outputs.version }}
|
||||
|
||||
- name: Download firefox source and dependancies
|
||||
run: yarn download
|
||||
|
||||
@ -226,9 +239,8 @@ jobs:
|
||||
|
||||
- name: Rename artifacts
|
||||
run: |
|
||||
find ./engine/obj-*/dist/
|
||||
cp ./engine/obj-*/dist/*.dmg .
|
||||
mv *.dmg "pulse-browser.macos.dmg"
|
||||
mv ./dist/*.dmg "pulse-browser.macos.dmg"
|
||||
mv ./dist/output.mar macos.mar
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v2
|
||||
@ -236,6 +248,18 @@ jobs:
|
||||
name: pulse-browser.macos.dmg
|
||||
path: ./pulse-browser.macos.dmg
|
||||
|
||||
- name: Upload mar
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: macos.mar
|
||||
path: ./macos.mar
|
||||
|
||||
- name: Upload update manifests
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: macos_update_manifest
|
||||
path: ./dist/update
|
||||
|
||||
source:
|
||||
runs-on: ubuntu-latest
|
||||
needs: [build-data]
|
||||
@ -250,9 +274,12 @@ jobs:
|
||||
git config --global user.email "trickypr@users.noreply.github.com"
|
||||
git config --global user.name "TrickyPR"
|
||||
|
||||
- name: Setup melon
|
||||
- name: Setup gluon
|
||||
run: yarn && yarn setupLink
|
||||
|
||||
- name: Load gluon CI setup
|
||||
run: yarn gluon ci -- --brand alpha --display-version ${{ needs.build-data.outputs.version }}
|
||||
|
||||
- name: Download firefox source and dependancies
|
||||
run: yarn download --verbose
|
||||
|
||||
@ -290,22 +317,22 @@ jobs:
|
||||
run: |
|
||||
yarn setupLink:win
|
||||
|
||||
- name: Load gluon CI setup
|
||||
run: yarn gluon ci -- --brand alpha --display-version ${{ needs.build-data.outputs.version }}
|
||||
|
||||
- name: Download
|
||||
run: yarn download
|
||||
|
||||
- name: Import
|
||||
run: yarn imp
|
||||
|
||||
- name: Use alpha branding
|
||||
shell: bash --noprofile --norc -eo pipefail {0}
|
||||
run: |
|
||||
echo "ac_add_options --with-branding=browser/branding/alpha" >> mozconfig
|
||||
|
||||
- name: Build
|
||||
run: yarn build -- --skip-patch-check
|
||||
|
||||
- name: Package
|
||||
run: yarn package
|
||||
run: |
|
||||
yarn package
|
||||
mv ./dist/output.mar windows.mar
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v2
|
||||
@ -313,6 +340,18 @@ jobs:
|
||||
name: pulse-browser.installer.exe
|
||||
path: ./dist/pulse-browser.installer.exe
|
||||
|
||||
- name: Upload mar
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: windows.mar
|
||||
path: ./windows.mar
|
||||
|
||||
- name: Upload update manifests
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: windows_update_manifest
|
||||
path: ./dist/update
|
||||
|
||||
release:
|
||||
name: Release
|
||||
needs: [build-data, linux, source, mac, windows]
|
||||
@ -332,3 +371,9 @@ jobs:
|
||||
pulse-browser.source.tar.gz
|
||||
pulse-browser.macos.dmg
|
||||
pulse-browser.installer.exe
|
||||
windows.mar
|
||||
macos.mar
|
||||
linux.mar
|
||||
|
||||
- name: List
|
||||
run: find .
|
||||
|
@ -1,24 +1,18 @@
|
||||
# Browser branding
|
||||
ac_add_options --enable-update-channel=stable
|
||||
ac_add_options --with-ccache=sccache
|
||||
ac_add_options --without-wasm-sandboxed-libraries
|
||||
|
||||
ac_add_options --with-app-basename="Pulse Browser"
|
||||
ac_add_options --with-app-name=pulse-browser
|
||||
ac_add_options --with-app-name=${binName}
|
||||
export MOZ_USER_DIR="Pulse browser"
|
||||
export MOZ_APP_VENDOR="Pulse browser"
|
||||
export MOZ_APP_BASENAME=PulseBrowser
|
||||
export MOZ_APP_PROFILE=pulse-browser
|
||||
export MOZ_APP_PROFILE=${binName}
|
||||
export MOZ_APP_DISPLAYNAME="Pulse browser"
|
||||
export MOZ_MACBUNDLE_ID=com.fushra.browser.desktop
|
||||
export MOZ_DISTRIBUTION_ID=com.fushra.browser.desktop
|
||||
export MOZ_MACBUNDLE_NAME="Pulse browser.app"
|
||||
|
||||
# Speed up builds by disabling components we don't care about
|
||||
ac_add_options --disable-geckodriver
|
||||
ac_add_options --disable-profiling
|
||||
ac_add_options --disable-tests
|
||||
|
||||
# Misc
|
||||
export MOZ_INCLUDE_SOURCE_INFO=1
|
||||
export MOZ_REQUIRE_SIGNING=
|
||||
|
2
gluon
2
gluon
@ -1 +1 @@
|
||||
Subproject commit f5bf98d03a0bcd3bf13609762b573b6c8161831c
|
||||
Subproject commit 0c2c22e82cb25d6d6bf49b08544e1ad4316085d0
|
43
gluon.json
43
gluon.json
@ -3,10 +3,10 @@
|
||||
"vendor": "Fushra",
|
||||
"appId": "com.fushra.browser.desktop",
|
||||
"binaryName": "pulse-browser",
|
||||
"updateHostname": "updates.pulsebrowser.app",
|
||||
"version": {
|
||||
"product": "firefox",
|
||||
"version": "102.0",
|
||||
"displayVersion": "1.0.0"
|
||||
"version": "102.0"
|
||||
},
|
||||
"buildOptions": {
|
||||
"generateBranding": true
|
||||
@ -30,19 +30,52 @@
|
||||
"backgroundColor": "#2B2A33",
|
||||
"brandShorterName": "Pulse",
|
||||
"brandShortName": "Pulse Browser",
|
||||
"brandFullName": "Pulse Browser"
|
||||
"brandFullName": "Pulse Browser",
|
||||
"release": {
|
||||
"displayVersion": "1.0.0",
|
||||
"github": {
|
||||
"repo": "pulse-browser/browser"
|
||||
},
|
||||
"x86": {
|
||||
"windowsMar": "windows.mar",
|
||||
"macosMar": "macosIntel.mar",
|
||||
"linuxMar": "linux.mar"
|
||||
}
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"backgroundColor": "#2B2A33",
|
||||
"brandShorterName": "Pulse",
|
||||
"brandShortName": "Pulse Browser",
|
||||
"brandFullName": "Pulse Browser Beta"
|
||||
"brandFullName": "Pulse Browser Beta",
|
||||
"release": {
|
||||
"displayVersion": "1.0.0-b.0",
|
||||
"github": {
|
||||
"repo": "pulse-browser/browser"
|
||||
},
|
||||
"x86": {
|
||||
"windowsMar": "windows.mar",
|
||||
"macosMar": "macosIntel.mar",
|
||||
"linuxMar": "linux.mar"
|
||||
}
|
||||
}
|
||||
},
|
||||
"alpha": {
|
||||
"backgroundColor": "#2B2A33",
|
||||
"brandShorterName": "Pulse",
|
||||
"brandShortName": "Pulse Browser",
|
||||
"brandFullName": "Pulse Browser Alpha"
|
||||
"brandFullName": "Pulse Browser Alpha",
|
||||
"release": {
|
||||
"displayVersion": "1.0.0-a.0",
|
||||
"github": {
|
||||
"repo": "pulse-browser/browser"
|
||||
},
|
||||
"x86": {
|
||||
"windowsMar": "windows.mar",
|
||||
"macosMar": "macosIntel.mar",
|
||||
"linuxMar": "linux.mar"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -25,6 +25,7 @@
|
||||
"rebuild:win": "cd gluon && yarn build:win && cd ..",
|
||||
"package": "gluon package",
|
||||
"ff-version": "gluon ff-version",
|
||||
"licenseCheck": "gluon license-check"
|
||||
"licenseCheck": "gluon license-check",
|
||||
"gluon": "gluon"
|
||||
}
|
||||
}
|
||||
|
13
src/build/moz-build.patch
Normal file
13
src/build/moz-build.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/build/moz.build b/build/moz.build
|
||||
index 671e77e97b351148a871022769e41798db3781eb..0386c1283d695f21074092a015f7d5b09ad94884 100644
|
||||
--- a/build/moz.build
|
||||
+++ b/build/moz.build
|
||||
@@ -91,7 +91,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
|
||||
if CONFIG[var]:
|
||||
appini_defines[var] = True
|
||||
|
||||
- appini_defines["MOZ_APPUPDATE_HOST"] = "aus5.mozilla.org"
|
||||
+ appini_defines["MOZ_APPUPDATE_HOST"] = "localhost:8000"
|
||||
if CONFIG["MOZ_APPUPDATE_HOST"]:
|
||||
appini_defines["MOZ_APPUPDATE_HOST"] = CONFIG["MOZ_APPUPDATE_HOST"]
|
||||
|
Loading…
Reference in New Issue
Block a user