From 5ca89116e7a0886d92a1b20d2b6ff862e7d4ea40 Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Wed, 24 Jul 2024 00:35:06 +0200 Subject: [PATCH] chore: Update Windows profile build workflow to remove unnecessary steps and improve efficiency --- .github/workflows/alpha.yml | 40 +++++++++++------------ .github/workflows/src/windows_mozconfig | 8 ++--- .github/workflows/windows-alpha-build.yml | 2 +- README.md | 2 +- configs/common/mozconfig | 6 ---- configs/linux/mozconfig | 7 ++++ 6 files changed, 33 insertions(+), 32 deletions(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 584fca5ad..0c8246522 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -179,33 +179,33 @@ jobs: name: zen.source.tar.gz path: ./zen.source.tar.gz - windows-step-1: - name: Windows build step 1 (PGO build) - uses: ./.github/workflows/windows-alpha-build.yml - needs: [build-data] - permissions: - contents: write - with: - build-version: ${{ needs.build-data.outputs.version }} - generate-gpo: true - profile-data-path-archive: zen-windows-x86_64-profile-data-and-jarlog.zip + #windows-step-1: + # name: Windows build step 1 (PGO build) + # uses: ./.github/workflows/windows-alpha-build.yml + # needs: [build-data] + # permissions: + # contents: write + # with: + # build-version: ${{ needs.build-data.outputs.version }} + # generate-gpo: true + # profile-data-path-archive: zen-windows-x86_64-profile-data-and-jarlog.zip - windows-step-2: - name: Windows build step 2 (Generate profile data) - uses: ./.github/workflows/windows-profile-build.yml - permissions: - contents: write - needs: [windows-step-1, build-data] - with: - build-version: ${{ needs.build-data.outputs.version }} - profile-data-path-archive: zen-windows-x86_64-profile-data-and-jarlog.zip + #windows-step-2: + # name: Windows build step 2 (Generate profile data) + # uses: ./.github/workflows/windows-profile-build.yml + # permissions: + # contents: write + # needs: [windows-step-1, build-data] + # with: + # build-version: ${{ needs.build-data.outputs.version }} + # profile-data-path-archive: zen-windows-x86_64-profile-data-and-jarlog.zip windows-step-3: name: Windows build step 3 (build with profile data) uses: ./.github/workflows/windows-alpha-build.yml permissions: contents: write - needs: [build-data, windows-step-2] + needs: [build-data] with: build-version: ${{ needs.build-data.outputs.version }} generate-gpo: false diff --git a/.github/workflows/src/windows_mozconfig b/.github/workflows/src/windows_mozconfig index 9199127f7..ead6d1d24 100644 --- a/.github/workflows/src/windows_mozconfig +++ b/.github/workflows/src/windows_mozconfig @@ -35,10 +35,10 @@ if test "$ZEN_GA_GENERATE_PROFILE"; then ac_add_options --enable-profile-generate=cross ac_add_options --without-wasm-sandboxed-libraries else - ac_add_options --disable-profiling - ac_add_options --enable-profile-use=cross - ac_add_options --with-pgo-profile-path=$(echo ~)/artifact/merged.profdata - ac_add_options --with-pgo-jarlog=$(echo ~)/artifact/en-US.log + # ac_add_options --disable-profiling + # ac_add_options --enable-profile-use=cross + # ac_add_options --with-pgo-profile-path=$(echo ~)/artifact/merged.profdata + # ac_add_options --with-pgo-jarlog=$(echo ~)/artifact/en-US.log fi # ALWAYS MANTAIN ONE LINE BREAK AT THE END OF THIS FILE \ No newline at end of file diff --git a/.github/workflows/windows-alpha-build.yml b/.github/workflows/windows-alpha-build.yml index 3948cef5d..ab1b8d17c 100644 --- a/.github/workflows/windows-alpha-build.yml +++ b/.github/workflows/windows-alpha-build.yml @@ -136,7 +136,7 @@ jobs: unset SURFER_PLATFORM export ZEN_CROSS_COMPILING=1 if test ${{ inputs.generate-gpo }}; then - export ZEN_GA_GENERATE_PROFILE=1 + #export ZEN_GA_GENERATE_PROFILE=1 fi sh .github/workflows/src/alpha-build.sh diff --git a/README.md b/README.md index f99569f0b..05a0175fb 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Experience tranquillity while browsing the web without people tracking you! # Compatibility -Zen is currently built using firefox version `128.0`! +Zen is currently built using firefox version `128.0.2`! * Checkout the latest [releases notes](https://get-zen.vercel.app/release-notes)! diff --git a/configs/common/mozconfig b/configs/common/mozconfig index c1e19fd87..2b1771ed6 100644 --- a/configs/common/mozconfig +++ b/configs/common/mozconfig @@ -77,12 +77,6 @@ if test "$ZEN_RELEASE"; then ac_add_options OPT_LEVEL="3" export RUSTC_OPT_LEVEL="3" ac_add_options RUSTC_OPT_LEVEL="3" - - # PGO may cause link errors on windows! - if ! test "$ZEN_CROSS_COMPILING"; then - export MOZ_PGO=1 - ac_add_options MOZ_PGO=1 - fi fi ac_add_options --enable-unverified-updates diff --git a/configs/linux/mozconfig b/configs/linux/mozconfig index cfec8b8d5..a9e0fd6c7 100644 --- a/configs/linux/mozconfig +++ b/configs/linux/mozconfig @@ -25,6 +25,13 @@ if test "$ZEN_RELEASE"; then mk_add_options 'export CCACHE_CPP2=yes' ac_add_options --with-ccache=/home/runner/.mozbuild/sccache/sccache mk_add_options 'export SCCACHE_GHA_ENABLED=on' + + # PGO may cause link errors on windows! + if ! test "$ZEN_CROSS_COMPILING"; then + # WE ARE JUST SUPPORTING PGO FOR LINUX! + export MOZ_PGO=1 + ac_add_options MOZ_PGO=1 + fi fi # Disable telemetry and tracking