diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 4ddfc5683..49ae10da8 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -182,7 +182,7 @@ jobs: with: build-version: ${{ needs.build-data.outputs.version }} generate-gpo: true - profile-data-path: zen-windows-x86_64-profile-data-and-jarlog + profile-data-path-archive: zen-windows-x86_64-profile-data-and-jarlog.zip windows-step-2: name: Windows build step 2 (Generate profile data) @@ -192,7 +192,7 @@ jobs: needs: [windows-step-1, build-data] with: build-version: ${{ needs.build-data.outputs.version }} - profile-data-path: zen-windows-x86_64-profile-data-and-jarlog + 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) @@ -203,7 +203,6 @@ jobs: with: build-version: ${{ needs.build-data.outputs.version }} generate-gpo: false - profile-data-path: zen-windows-x86_64-profile-data-and-jarlog linux: name: Linux build diff --git a/.github/workflows/windows-alpha-build.yml b/.github/workflows/windows-alpha-build.yml index 166cd6029..0e95ecf18 100644 --- a/.github/workflows/windows-alpha-build.yml +++ b/.github/workflows/windows-alpha-build.yml @@ -10,9 +10,8 @@ on: description: 'The version to build' required: true type: string - profile-data-path: - description: 'The path to the profile data' - required: false + profile-data-path-archive: + description: 'The path to the zip archive containing the profile data' type: string jobs: @@ -126,7 +125,6 @@ jobs: name: Download artifact if use profdata if: ${{ !inputs.generate-gpo }} with: - name: ${{ inputs.profile-data-path }} path: ~/artifact - name: Import @@ -169,7 +167,7 @@ jobs: uses: actions/upload-artifact@v4 if: ${{ inputs.generate-gpo }} with: - name: ${{ inputs.profile-data-path }} + name: ${{ inputs.profile-data-path-archive }} path: ./zen.win64-pgo-stage-1.zip - name: Upload mar diff --git a/.github/workflows/windows-profile-build.yml b/.github/workflows/windows-profile-build.yml index 5cd4a6ae0..6e3ec59cc 100644 --- a/.github/workflows/windows-profile-build.yml +++ b/.github/workflows/windows-profile-build.yml @@ -6,8 +6,8 @@ on: description: 'The version to build' required: true type: string - profile-data-path: - description: 'The path to the profile data' + profile-data-path-archive: + description: 'The path to the zip archive containing the profile data' required: false type: string @@ -26,7 +26,7 @@ jobs: run: | cd C:\artifact ls - 7z x zen-*.zip + 7z x ${{ inputs.profile-data-path-archive }} - uses: actions/checkout@v4 name: Clone @@ -48,10 +48,13 @@ jobs: echo 'LLVM_PROFDATA=/c/Users/runneradmin/.mozbuild/clang/bin/llvm-profdata.exe JARLOG_FILE=en-US.log ./mach python build/pgo/profileserver.py --binary /c/artifact/zen/zen.exe' '' >> mozilla-build-run.sh C:\mozilla-build\start-shell.bat $workspace_dir\mozilla-build-run.sh - - name: Publish + - name: Publish merged.profdata uses: actions/upload-artifact@v4 with: - name: ${{ inputs.profile-data-path }} - path: | - merged.profdata - en-US.log + path: merged.profdata + + - name: Publish en-US.log + uses: actions/upload-artifact@v4 + with: + path: en-US.log +