From acb1750bba59773e24e5edb7e6e4aed8a64b9b58 Mon Sep 17 00:00:00 2001
From: Mauro Balades <mauro.balades@tutanota.com>
Date: Sun, 21 Jul 2024 11:54:54 +0200
Subject: [PATCH] chore: Update build workflows and mozconfig files

---
 .github/workflows/src/alpha-build.sh      | 3 ++-
 .github/workflows/src/windows_mozconfig   | 2 ++
 .github/workflows/windows-alpha-build.yml | 1 -
 configs/common/mozconfig                  | 8 +++-----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/src/alpha-build.sh b/.github/workflows/src/alpha-build.sh
index d23ce89c..35205ceb 100644
--- a/.github/workflows/src/alpha-build.sh
+++ b/.github/workflows/src/alpha-build.sh
@@ -8,10 +8,11 @@ then
   sudo apt-get install -y xvfb
 fi
 
+ulimit -n 4096
+
 # Check if xfvb is installed
 if ! command -v Xvfb &> /dev/null
 then
-  ulimit -n 4096
   Xvfb :2 -screen 0 1024x768x24 &
   export LLVM_PROFDATA=$HOME/.mozbuild/clang/bin/llvm-profdata
   export DISPLAY=:2
diff --git a/.github/workflows/src/windows_mozconfig b/.github/workflows/src/windows_mozconfig
index e578f698..b2604d2a 100644
--- a/.github/workflows/src/windows_mozconfig
+++ b/.github/workflows/src/windows_mozconfig
@@ -30,8 +30,10 @@ export RUSTFLAGS="$RUSTFLAGS -Ctarget-cpu=x86-64"
 
 ac_add_options --disable-maintenance-service
 ac_add_options --disable-bits-download
+ac_add_options --disable-profiling
 
 if test "$ZEN_GA_GENERATE_PROFILE"; then
+  mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
   ac_add_options --enable-profile-generate=cross
 else
   ac_add_options --enable-profile-use=cross
diff --git a/.github/workflows/windows-alpha-build.yml b/.github/workflows/windows-alpha-build.yml
index f10418da..670ef814 100644
--- a/.github/workflows/windows-alpha-build.yml
+++ b/.github/workflows/windows-alpha-build.yml
@@ -63,7 +63,6 @@ jobs:
           path: ${HOME}/win-cross
           key: clang-17
 
-
       - name: Configure sccache
         uses: actions/github-script@v7
         with:
diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index 3eff8de1..f7b7a964 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -18,7 +18,7 @@ export MOZ_MACBUNDLE_NAME="Zen Browser.app"
 
 # Uncomment if builds are too resource hungry
 # mk_add_options MOZ_MAKE_FLAGS="-j4"
-#ac_add_options --enable-linker=gold
+ac_add_options --enable-linker=gold
 
 # Misc
 export MOZ_STUB_INSTALLER=1
@@ -77,10 +77,8 @@ if test "$ZEN_RELEASE"; then
   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
+  export MOZ_PGO=1
+  ac_add_options MOZ_PGO=1
 
   mk_add_options 'export RUSTC_WRAPPER=/home/runner/.mozbuild/sccache/sccache'
   mk_add_options 'export CCACHE_CPP2=yes'