diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index dd39145bd..82c0115a5 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -184,33 +184,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.win64-pgo-stage-1.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.win64-pgo-stage-1.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 e662a97b2..1dae82a81 100644 --- a/.github/workflows/src/windows_mozconfig +++ b/.github/workflows/src/windows_mozconfig @@ -27,14 +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 -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/configs/common/mozconfig b/configs/common/mozconfig index a00a6e05c..5e9e8e85a 100644 --- a/configs/common/mozconfig +++ b/configs/common/mozconfig @@ -77,9 +77,6 @@ if test "$ZEN_RELEASE"; then export AUTOCLOBBER=1 if ! test "$ZEN_CROSS_COMPILING"; then - # We declare these later in windows builds, look at windows_mozconfig - export MOZ_PGO=1 - ac_add_options MOZ_PGO=1 # It causes link errors on windows ac_add_options --disable-dmd