trying direct key

seed-hypermedia · Aug 8, 2023 · 63b715d · 63b715d
1 parent 0a4a11a
commit 63b715d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/.github/workflows/electron-release.yml b/.github/workflows/electron-release.yml
@@ -137,6 +137,13 @@ jobs:
           mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
           cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
 
+      # - name: Import MacOS certs
+      #   if: matrix.config.os == 'macos-latest'
+      #   uses: apple-actions/import-codesign-certs@v2
+      #   with: 
+      #     p12-file-base64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+      #     p12-password: ${{ secrets.P12_PASSWORD }}
+
       - name: create AppImage private key file
         if: matrix.config.os == 'ubuntu-latest'
         run: |
@@ -169,11 +176,19 @@ jobs:
         env:
           GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_ID_PASSWORD: '${{ secrets.APPLE_ID_PASSWORD }}'
-          APPLE_TEAM_ID: '${{ secrets.APPLE_TEAM_ID }}'
-          # APPLE_API_ISSUER: '${{ secrets.APPLE_API_ISSUER }}'
+          # APPLE_ID: ${{ secrets.APPLE_ID }}
+          # APPLE_ID_PASSWORD: '${{ secrets.APPLE_ID_PASSWORD }}'
+          # APPLE_TEAM_ID: '${{ secrets.APPLE_TEAM_ID }}'
+          APPLE_API_ISSUER: '${{ secrets.APPLE_API_ISSUER }}'
+          APPLE_API_KEY: $RUNNER_TEMP/build_certificate.p12
+          APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
           # APPLE_API_PRIVKEY: '${{ secrets.APPLE_API_PRIVKEY }}'
           # APPLE_API_KEY: '${{ secrets.APPLE_API_KEY }}'
           # WINDOWS_PFX_FILE: '${{ steps.write_file.outputs.filePath }}'
           # WINDOWS_PFX_PASSWORD: '${{ secrets.WINDOWS_PFX_PASSWORD }}'
+
+      - name: Clean up keychain and provisioning profile
+        if: ${{ always() }}
+        run: |
+          security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
+          rm ~/Library/MobileDevice/Provisioning\ Profiles/build_pp.provisionprofile
diff --git a/frontend/apps/electron/forge.config.js b/frontend/apps/electron/forge.config.js
@@ -27,9 +27,12 @@ module.exports = {
     },
     osxNotarize: {
       tool: 'notarytool',
-      appleId: process.env.APPLE_ID,
-      appleIdPassword: process.env.APPLE_ID_PASSWORD,
-      teamId: process.env.APPLE_TEAM_ID,
+      // appleId: process.env.APPLE_ID,
+      // appleIdPassword: process.env.APPLE_ID_PASSWORD,
+      // teamId: process.env.APPLE_TEAM_ID,
+      appleApiKey: process.env.APPLE_API_KEY,
+      appleApiKeyId: process.env.APPLE_API_KEY_ID,
+      appleApiIssuer: process.env.APPLE_API_ISSUER,
     },
     packageManager: 'yarn',
     extraResource: [daemonBinaryPath],