diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml index 61850526f..cc82e6e4e 100644 --- a/.github/workflows/linux-release-build.yml +++ b/.github/workflows/linux-release-build.yml @@ -135,6 +135,7 @@ jobs: - name: Package env: SURFER_COMPAT: ${{ matrix.arch }} + ZEN_GA_DISABLE_PGO: true run: | export SURFER_PLATFORM="linux" export ZEN_RELEASE=1 diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml index 411f16e57..a07dd802e 100644 --- a/.github/workflows/macos-release-build.yml +++ b/.github/workflows/macos-release-build.yml @@ -134,6 +134,7 @@ jobs: - name: Package env: SURFER_COMPAT: ${{ matrix.arch }} + ZEN_GA_DISABLE_PGO: true run: | export SURFER_PLATFORM="darwin" export MACOS_APPLE_DEVELOPER_ID="${{ secrets.macOS_AppleDeveloperId }}" @@ -158,6 +159,7 @@ jobs: --apple-id "${{ secrets.macOS_AppleAccountId }}" \ --team-id "${{ secrets.macOS_AppleDeveloperIdTeamId }}" \ --password "${{ secrets.macOS_AppleDeveloperIdPassword }}" \ + --verbose \ --wait xcrun stapler staple "zen.macos-${{ matrix.arch }}.dmg" diff --git a/build/codesign/codesign.bash b/build/codesign/codesign.bash index 79e3945e4..2fc6c5142 100644 --- a/build/codesign/codesign.bash +++ b/build/codesign/codesign.bash @@ -154,7 +154,7 @@ codesign -vvv --deep --strict "${BUNDLE}" cp Zen_Browser.provisionprofile "${BUNDLE}"/Contents/embedded.provisionprofile # Staple the ticket -xcrun stapler staple "${BUNDLE}" --verbose || exit 0 +xcrun stapler staple --verbose "${BUNDLE}" || exit 0 # Create a DMG if [ ! -z "${OUTPUT_DMG_FILE}" ]; then diff --git a/configs/linux/mozconfig b/configs/linux/mozconfig index 11df2433d..cdabe9862 100644 --- a/configs/linux/mozconfig +++ b/configs/linux/mozconfig @@ -12,8 +12,12 @@ if test "$SURFER_COMPAT" = "x86_64"; then ac_add_options --enable-eme=widevine # Enable Profile Guided Optimization - export MOZ_PGO=1 - ac_add_options MOZ_PGO=1 + if test "$ZEN_GA_DISABLE_PGO"; then + export ZEN_DUMMY=1 + else + export MOZ_PGO=1 + ac_add_options MOZ_PGO=1 + fi # Optimization flags for SURFER_COMPAT ac_add_options --enable-optimize="-O3 -w -ftree-vectorize -Qvec -mfpmath=sse -mprfchw -msse3 -mcx16 -msahf" diff --git a/configs/macos/mozconfig b/configs/macos/mozconfig index 0adf87e96..7528354cf 100644 --- a/configs/macos/mozconfig +++ b/configs/macos/mozconfig @@ -7,8 +7,12 @@ export MOZ_MACBUNDLE_ID=${appId} export MOZ_MACBUNDLE_NAME="Zen Browser.app" if test "$ZEN_RELEASE"; then - export MOZ_PGO=1 - ac_add_options MOZ_PGO=1 + if test "$ZEN_GA_DISABLE_PGO"; then + export ZEN_DUMMY=1 + else + export MOZ_PGO=1 + ac_add_options MOZ_PGO=1 + fi fi if test "$SURFER_COMPAT" = "x86_64"; then