Update @zen-browser/surfer dependency to version 1.9.15 and refine ma…

…cOS build workflows
zen-browser · Jan 28, 2025 · c19748b · c19748b
1 parent 00682ed
commit c19748b
Show file tree

Hide file tree

Showing 6 changed files with 4,567 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -530,8 +530,7 @@ jobs:
             cp -a ../windows_update_manifest_arm64/.  updates/
           fi
 
-          cp -a ../macos_update_manifest_aarch64/.  updates/
-          cp -a ../macos_update_manifest_x86_64/.  updates/
+          cp -a ../macos_update_manifest/.  updates/
 
       - name: Commit
         uses: stefanzweifel/git-auto-commit-action@v5
@@ -561,7 +560,6 @@ jobs:
             windows.mar
             windows-arm64.mar
             macos.mar
-            macos-aarch64.mar
             zen.installer.exe
             zen.installer-arm64.exe
             zen.macos-universal.dmg
@@ -595,8 +593,7 @@ jobs:
             linux-aarch64.mar
             .github/workflows/object/windows-x64-signed-x86_64/windows.mar
             .github/workflows/object/windows-x64-signed-arm64/windows-arm64.mar
-            macos-x86_64.mar
-            macos-aarch64.mar
+            macos.mar
             .github/workflows/object/windows-x64-signed-x86_64/zen.installer.exe
             .github/workflows/object/windows-x64-signed-arm64/zen.installer-arm64.exe
             zen.macos-x86_64.dmg

diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml
@@ -152,15 +152,9 @@ jobs:
 
       - name: Upload host mar
         uses: actions/upload-artifact@v4
-        if: matrix.arch == 'x86_64'
+        if: matrix.arch == 'aarch64'
         with:
           retention-days: 1
           name: zen-macos-host-mar
           path: ./zen-macos-host-mar
 
-      - name: Upload build artifact (update manifests)
-        uses: actions/upload-artifact@v4
-        with:
-          retention-days: 5
-          name: macos_update_manifest_${{ matrix.arch }}
-          path: ./dist/update
diff --git a/.github/workflows/macos-universal-release-build.yml b/.github/workflows/macos-universal-release-build.yml
@@ -225,6 +225,13 @@ jobs:
         with:
           name: zen-macos-host-mar
 
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: zen.macos-universal.dmg
+          path: ./zen.macos-universal.dmg
+
       - name: Package for mar
         env:
           JUST_MAR: true
@@ -238,19 +245,19 @@ jobs:
           export MAR=$(pwd)/zen-macos-host-mar
           chmod +x $MAR
           echo "MAR=$MAR"
-          pnpm package
+          pnpm package --verbose
           mv ./dist/output.mar ./macos.mar
 
-      - name: Upload build artifact
+      - name: Upload build artifact (.mar)
         uses: actions/upload-artifact@v4
         with:
           retention-days: 5
-          name: zen.macos-universal.dmg
-          path: ./zen.macos-universal.dmg
+          name: macos.mar
+          path: ./macos.mar
 
-      - name: Upload build artifact (.mar)
+      - name: Upload build artifact (update manifests)
         uses: actions/upload-artifact@v4
         with:
           retention-days: 5
-          name: macos.mar
-          path: ./macos.mar
+          name: macos_update_manifest
+          path: ./dist/update