fixup! Sign app on macOS

Scille · Oct 31, 2024 · 3965dc6 · 3965dc6
1 parent b138511
commit 3965dc6
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/.github/workflows/package-client.yml b/.github/workflows/package-client.yml
@@ -360,7 +360,18 @@ jobs:
         # The reason is for npm to pass the flag `--nightly` to the underlying npm script.
         # But since the base npm script `npm run electron:release` call another npm script,
         # we need to escape the flag another time by adding another `--`.
-        run: >-
+        shell: bash
+        run: |
+          if ${{ matrix.platform == 'macos'}}; then
+            export CSC_LINK=${{ secrets.MACOS_CERT }}
+            export CSC_KEY_PASSWORD=${{ secrets.MACOS_CERT_PASSWD }}
+            export CSC_NAME=${{ secrets.MACOS_CERT_COMMON_NAME }}
+            export CSC_IDENTITY_AUTO_DISCOVERY=true
+            export CSC_KEYCHAIN=build.keychain
+            export APPLE_TEAM_ID=${{ secrets.MACOS_NOTARIZATION_TEAM_ID }}
+            export APPLE_ID=${{ secrets.MACOS_NOTARIZATION_APPLE_ID }}
+            export APPLE_APP_SPECIFIC_PASSWORD=${{ secrets.MACOS_NOTARIZATION_PASSWD }}
+          fi
           npm run electron:release
           ${{ (matrix.platform == 'linux' || inputs.nightly_build || matrix.platform == 'macos') && '--' || '' }}
           ${{ matrix.platform == 'linux' && 'appimage' || '' }}
@@ -370,14 +381,6 @@ jobs:
           PARSEC_APP_SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           # FIXME: Remove me before merging, I'm just here to test the code signing for macos
           CSC_FOR_PULL_REQUEST: ${{ matrix.platform == 'macos' }}
-          CSC_LINK: ${{ matrix.platform == 'macos' && secrets.MACOS_CERT || '' }}
-          CSC_KEY_PASSWORD: ${{ matrix.platform == 'macos' && secrets.MACOS_CERT_PASSWD }}
-          CSC_NAME: ${{ matrix.platform == 'macos' && secrets.MACOS_CERT_COMMON_NAME }}
-          CSC_IDENTITY_AUTO_DISCOVERY: ${{ matrix.platform == 'macos' }}
-          CSC_KEYCHAIN: ${{ matrix.platform == 'macos' && 'build.keychain' }}
-          APPLE_TEAM_ID: ${{ matrix.platform == 'macos' && secrets.MACOS_NOTARIZATION_TEAM_ID }}
-          APPLE_ID: ${{ matrix.platform == 'macos' && secrets.MACOS_NOTARIZATION_APPLE_ID}}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ matrix.platform == 'macos' && secrets.MACOS_NOTARIZATION_PASSWD }}
         working-directory: client/electron
         timeout-minutes: 10