Refactor build configurations to standardize runner environments and update LTO settings in mozconfig

This commit is contained in:
mr. M
2025-01-08 21:19:23 +01:00
parent 46c8d6d3e4
commit 6c9fb9b3bb
6 changed files with 7 additions and 10 deletions

View File

@@ -17,7 +17,7 @@ jobs:
permissions:
contents: write
# aarch64 does not need full 16x
runs-on: ${{ (inputs.release-branch == 'release' && matrix.arch == 'x86_64') && 'warp-ubuntu-latest-x64-16x' || 'ubuntu-latest' }}
runs-on: ${{ (inputs.release-branch == 'release' && matrix.arch == 'x86_64') && 'ubuntu-latest' || 'ubuntu-latest' }}
strategy:
fail-fast: false
matrix:

View File

@@ -15,7 +15,7 @@ on:
jobs:
mac-build:
name: Build macOS - ${{ matrix.arch }}
runs-on: ${{ inputs.release-branch == 'release' && 'warp-macos-14-arm64-6x' || 'macos-14' }}
runs-on: ${{ inputs.release-branch == 'release' && 'macos-14' || 'macos-14' }}
strategy:
fail-fast: false

View File

@@ -25,7 +25,7 @@ jobs:
matrix:
arch: [x86_64, aarch64]
runs-on: ${{ inputs.release-branch == 'release' && 'warp-windows-latest-x64-8x' || 'windows-latest' }}
runs-on: ${{ inputs.release-branch == 'release' && 'windows-latest' || 'windows-latest' }}
steps:
- name: Checkout repository

View File

@@ -23,7 +23,7 @@ jobs:
windows-build:
name: Build Windows - ${{ matrix.arch }}
# aarch64 does not need full 16x, and we also dont use full LTO when generating GPO
runs-on: ${{ (inputs.release-branch == 'release' && !inputs.generate-gpo && matrix.arch == 'x86_64') && 'warp-ubuntu-latest-x64-16x' || 'ubuntu-latest' }}
runs-on: ${{ (inputs.release-branch == 'release' && !inputs.generate-gpo && matrix.arch == 'x86_64') && 'ubuntu-latest' || 'ubuntu-latest' }}
strategy:
fail-fast: false

View File

@@ -56,8 +56,9 @@ if test "$ZEN_RELEASE"; then
if ! test "$ZEN_DISABLE_LTO"; then
# only enable full LTO when ZEN_RELEASE_BRANCH is 'release'
if test "$ZEN_RELEASE_BRANCH" = "release"; then
export MOZ_LTO=cross,full
ac_add_options --enable-lto=cross,full
# TODO: make it "full" once we have the resources to build it
export MOZ_LTO=cross,thin
ac_add_options --enable-lto=cross,thin
else
export MOZ_LTO=cross,thin
ac_add_options --enable-lto=cross,thin

View File

@@ -6,10 +6,6 @@ ac_add_options --enable-eme=widevine
export MOZ_MACBUNDLE_ID=${appId}
export MOZ_MACBUNDLE_NAME="Zen Browser.app"
# override LTO settings, for now...
export MOZ_LTO=cross,thin
ac_add_options --enable-lto=cross,thin
if test "$ZEN_RELEASE"; then
if test "$ZEN_GA_DISABLE_PGO"; then
export ZEN_DUMMY=1