From 9aee50ed3082f9e25ad61f8d02fd5fdef68c83dc Mon Sep 17 00:00:00 2001
From: Azeem Sajid <azeem.sajid@gmail.com>
Date: Fri, 13 Dec 2024 11:21:48 +0500
Subject: [PATCH] Build ZIP bundle

---
 .github/workflows/ci.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d37a92c3..b7379001 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -774,27 +774,27 @@ jobs:
       env:
         AC: 'Developer ID Application: matt wong (HXK8Y6Q9K2)'
         AI: 'dev.liquidaty.zsv'
+        ZIP: zsv.zip
       run: |
         find "$ZSV_ROOT" -type f -exec \
         codesign --verbose --deep --force --verify --options=runtime --timestamp \
             --sign "$AC" --identifier "$AI" "$ZSV_ROOT" {} +
 
+        cd "$ZSV_ROOT"
+        zip -r "$ZIP" .
+
         codesign --verbose --deep --force --verify --options=runtime --timestamp \
-            --identifier "$AI" --sign "$AC" "$ZSV_ROOT"
+            --identifier "$AI" --sign "$AC" "$ZSV_ROOT/$ZIP"
+
+        echo "ZIP=$ZIP" >>"$GITHUB_ENV"
 
     - name: Notarize
       env:
         AID: matt@liquidaty.com
         ASP: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
         TID: HXK8Y6Q9K2
-        ZIP: zsv.zip
       run: |
-        echo "ZIP=$ZIP" >>"$GITHUB_ENV"
-        cd "$ZSV_ROOT"
-        zip -r "$ZIP" .
-        mv "$ZIP" ../
-        cd ..
-        xcrun notarytool submit "$ZIP" \
+        xcrun notarytool submit "$ZSV_ROOT/$ZIP" \
           --apple-id "$AID" \
           --password "$ASP" \
           --team-id "$TID" \
@@ -803,16 +803,17 @@ jobs:
 
     - name: Staple
       run: |
-        xcrun stapler staple -v "$ZIP"
-        xcrun stapler validate "$ZIP"
+        xcrun stapler staple -v "$ZSV_ROOT/$ZIP"
+        xcrun stapler validate "$ZSV_ROOT/$ZIP"
 
     - name: Cleanup
+      if: always()
       run: security delete-keychain build.keychain
 
     - name: Upload (${{ env.ZIP }})
       uses: actions/upload-artifact@v4
       with:
         name: ${{ env.ZIP }}
-        path: ${{ env.ZIP }}
+        path: ${{ env.ZSV_ROOT }}/${{ env.ZIP }}
         retention-days: 7
         if-no-files-found: error