Try to upgrade notarization process

buttercup · Mar 28, 2024 · e794ccd · e794ccd
1 parent ee7c9ad
commit e794ccd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,13 +40,13 @@ jobs:
           node-version: 18
           architecture: ${{matrix.NODE_ARCHITECTURE}}
 
-      - name: Prepare for app notarization
-        if: startsWith(matrix.os, 'macos')
-        # Import Apple API key for app notarization on macOS
-        run: |
-            mkdir -p ~/private_keys/
-            echo '${{ secrets.api_key }}' > ~/private_keys/AuthKey_${{ secrets.api_key_id }}.p8
-            xcrun --find notarytool
+      # - name: Prepare for app notarization
+      #   if: startsWith(matrix.os, 'macos')
+      #   # Import Apple API key for app notarization on macOS
+      #   run: |
+      #       mkdir -p ~/private_keys/
+      #       echo '${{ secrets.api_key }}' > ~/private_keys/AuthKey_${{ secrets.api_key_id }}.p8
+
       - name: Build & Release app
         uses: CryogenicPlanet/action-electron-builder@v2
         with:
@@ -62,13 +62,15 @@ jobs:
           # release the app after building
           release: true
         env:
-          API_KEY_ID: ${{ secrets.api_key_id }}
-          API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}
+          # API_KEY_ID: ${{ secrets.api_key_id }}
+          # API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}
           NODE_ARCHITECTURE: ${{matrix.NODE_ARCHITECTURE}}
           USE_HARD_LINKS: false
           # macOS notarization envs
-          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          # APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+          # APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
 
       - name: Archive notorization logs
         if: always()

diff --git a/package.json b/package.json
@@ -56,7 +56,6 @@
   "homepage": "https://github.com/buttercup/desktop#readme",
   "build": {
     "afterPack": "./resources/scripts/afterPack.js",
-    "afterSign": "electron-builder-notarize",
     "afterAllArtifactBuild": "./resources/scripts/afterAllArtifactBuild.js",
     "appId": "pw.buttercup.desktop",
     "asar": true,
@@ -107,7 +106,8 @@
       "entitlementsInherit": "./resources/build/entitlements.plist",
       "gatekeeperAssess": false,
       "hardenedRuntime": true,
-      "icon": "./resources/build/icon.icns"
+      "icon": "./resources/build/icon.icns",
+      "notarize": true
     },
     "dmg": {
       "artifactName": "${productName}-${os}-x64-${version}.${ext}",