Revert "gh-14651: Changed zip builds to use tar" (gh-14681)

This commit is contained in:
mr. m
2026-07-22 11:25:03 +02:00
committed by GitHub
parent e5d38f76a6
commit c5373ee093
5 changed files with 7 additions and 9 deletions

View File

@@ -301,7 +301,7 @@ jobs:
needs: [windows-step-1, build-data]
with:
build-version: ${{ needs.build-data.outputs.version }}
profile-data-path-archive: zen.win64-pgo-stage-1.tar
profile-data-path-archive: zen.win64-pgo-stage-1.zip
release-branch: ${{ inputs.update_branch }}
windows-step-3:

View File

@@ -61,8 +61,7 @@ jobs:
if: ${{ matrix.arch == 'x86_64' }}
run: |
cd C:\artifact
ls
tar -xf .\${{ inputs.profile-data-path-archive }} -C C:\artifact
Expand-Archive -Path .\${{ inputs.profile-data-path-archive }} -DestinationPath C:\artifact
ls
- name: Setup

View File

@@ -261,19 +261,19 @@ jobs:
export ZEN_RELEASE=1
npm run package
ls ./dist
mv ./dist/zen-$(npm run --silent surfer -- get version | xargs).en-US.win64${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.tar zen.win64.tar
mv ./dist/zen-$(npm run --silent surfer -- get version | xargs).en-US.win64${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.zip zen.win64.zip
ls .
- name: Move package for PGO upload
if: ${{ inputs.generate-gpo && matrix.arch == 'x86_64' }}
run: |
set -x
mv ./zen.win64.tar ./zen.win64-pgo-stage-1.tar
mv ./zen.win64.zip ./zen.win64-pgo-stage-1.zip
- name: Rename artifacts
if: ${{ !inputs.generate-gpo }}
run: |
mv ./zen.win64.tar zen.win-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}.tar
mv ./zen.win64.zip zen.win-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}.zip
mv ./dist/output.mar windows${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.mar
mv ./dist/zen.installer.exe ./zen.installer${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.exe
@@ -283,7 +283,7 @@ jobs:
with:
retention-days: 2
name: ${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}-${{ inputs.profile-data-path-archive }}
path: ./zen.win64-pgo-stage-1.tar
path: ./zen.win64-pgo-stage-1.zip
- name: Remove unnecessary files from obj
if: ${{ !inputs.generate-gpo }}

View File

@@ -1 +1 @@
1.90
1.94.1

View File

@@ -10,7 +10,6 @@ if test "$ZEN_CROSS_COMPILING"; then
export WINEDEBUG=-all
export MOZ_STUB_INSTALLER=1
export MOZ_PKG_FORMAT=TAR
export CROSS_BUILD=1
CROSS_COMPILE=1