From 22dfa8daec0f51ce18c0ac08936c4fb18dc66198 Mon Sep 17 00:00:00 2001
From: Mauro Balades <mauro.balades@tutanota.com>
Date: Fri, 26 Jul 2024 09:19:18 +0200
Subject: [PATCH] refactor: Update alpha.yml workflow to use flat-manager v6.1
 for uploading flatpak bundle

---
 .github/workflows/alpha.yml                 | 38 ++++++++++-----------
 .github/workflows/src/windows_mozconfig     | 19 +++++------
 .github/workflows/windows-profile-build.yml |  1 +
 configs/common/mozconfig                    |  4 ++-
 4 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml
index 027331bc9..b1bbbc10c 100644
--- a/.github/workflows/alpha.yml
+++ b/.github/workflows/alpha.yml
@@ -184,26 +184,26 @@ 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)
diff --git a/.github/workflows/src/windows_mozconfig b/.github/workflows/src/windows_mozconfig
index a74a0976a..e662a97b2 100644
--- a/.github/workflows/src/windows_mozconfig
+++ b/.github/workflows/src/windows_mozconfig
@@ -27,15 +27,14 @@ export WINE="$TOOLS/wine/bin/wine64"
 ac_add_options --disable-maintenance-service
 ac_add_options --disable-bits-download
 
-# if test "$ZEN_GA_GENERATE_PROFILE"; then
-#   mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
-#   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
-# fi
+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 --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-profile-build.yml b/.github/workflows/windows-profile-build.yml
index 33d242502..71ec1e450 100644
--- a/.github/workflows/windows-profile-build.yml
+++ b/.github/workflows/windows-profile-build.yml
@@ -40,6 +40,7 @@ jobs:
         name: Download artifact 
         with:
           path: C:\artifact
+          name: ${{ inputs.profile-data-path-archive }}
 
       - name:  Unpack artifact
         run: |
diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index caf39c6bb..435fa1c52 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -49,7 +49,6 @@ if test "$ZEN_RELEASE"; then
   ac_add_options --enable-hardening
 
   ac_add_options --disable-crashreporter
-  ac_add_options --disable-dmd
   ac_add_options --disable-geckodriver
   ac_add_options --disable-rust-tests
   ac_add_options --disable-default-browser-agent
@@ -75,6 +74,9 @@ if test "$ZEN_RELEASE"; then
 
   mk_add_options AUTOCLOBBER=1
   export AUTOCLOBBER=1
+
+  export MOZ_PGO=1
+  ac_add_options MOZ_PGO=1
 fi
 
 ac_add_options --enable-unverified-updates