Browse Source

3.20.1-mac-notarize

cocktailpeanut 1 tháng trước cách đây
mục cha
commit
960994b190
2 tập tin đã thay đổi với 20 bổ sung6 xóa
  1. 13 0
      .github/workflows/build.yml
  2. 7 6
      package.json

+ 13 - 0
.github/workflows/build.yml

@@ -108,6 +108,14 @@ jobs:
         with:
         with:
           node-version: 22
           node-version: 22
 
 
+      - 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 Electron app
       - name: Build/release Electron app
         id: electron-builder
         id: electron-builder
         uses: samuelmeuli/action-electron-builder@v1.6.0
         uses: samuelmeuli/action-electron-builder@v1.6.0
@@ -122,6 +130,11 @@ jobs:
           release: true
           release: true
           mac_certs: ${{ secrets.mac_certs }}
           mac_certs: ${{ secrets.mac_certs }}
           mac_certs_password: ${{ secrets.mac_certs_password }}
           mac_certs_password: ${{ secrets.mac_certs_password }}
+        env:
+          # macOS notarization API key
+          API_KEY_ID: ${{ secrets.api_key_id }}
+          API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}
+
 
 
   linux:
   linux:
     needs: "create-release"
     needs: "create-release"

+ 7 - 6
package.json

@@ -1,7 +1,7 @@
 {
 {
   "name": "Pinokio",
   "name": "Pinokio",
   "private": true,
   "private": true,
-  "version": "3.20.0",
+  "version": "3.20.1",
   "homepage": "https://pinokio.co",
   "homepage": "https://pinokio.co",
   "description": "pinokio",
   "description": "pinokio",
   "main": "main.js",
   "main": "main.js",
@@ -11,11 +11,9 @@
     "start": "electron .",
     "start": "electron .",
     "pack": "./node_modules/.bin/electron-builder --dir",
     "pack": "./node_modules/.bin/electron-builder --dir",
     "eject": "hdiutil info | grep '/dev/disk' | awk '{print $1}' | xargs -I {} hdiutil detach {}",
     "eject": "hdiutil info | grep '/dev/disk' | awk '{print $1}' | xargs -I {} hdiutil detach {}",
-
     "l": "docker run --rm -ti -v $PWD:/project -w /project -e SNAPCRAFT_BUILD_ENVIRONMENT=host -e SNAP_DESTRUCTIVE_MODE=true electronuserland/builder bash -lc 'rm -rf node_modules && npm install && npm run monkeypatch && ./node_modules/.bin/electron-builder install-app-deps && ./node_modules/.bin/electron-builder -l'",
     "l": "docker run --rm -ti -v $PWD:/project -w /project -e SNAPCRAFT_BUILD_ENVIRONMENT=host -e SNAP_DESTRUCTIVE_MODE=true electronuserland/builder bash -lc 'rm -rf node_modules && npm install && npm run monkeypatch && ./node_modules/.bin/electron-builder install-app-deps && ./node_modules/.bin/electron-builder -l'",
     "mw": "rm -rf node_modules && npm install && npm run monkeypatch && ./node_modules/.bin/electron-builder install-app-deps && ./node_modules/.bin/electron-builder -mw && npm run zip",
     "mw": "rm -rf node_modules && npm install && npm run monkeypatch && ./node_modules/.bin/electron-builder install-app-deps && ./node_modules/.bin/electron-builder -mw && npm run zip",
     "build2": "npm run l && npm run mw",
     "build2": "npm run l && npm run mw",
-
     "dist": "npm run monkeypatch && ./node_modules/.bin/electron-builder install-app-deps && export SNAPCRAFT_BUILD_ENVIRONMENT=host && export SNAP_DESTRUCTIVE_MODE='true' && ./node_modules/.bin/electron-builder -l && npm run zip",
     "dist": "npm run monkeypatch && ./node_modules/.bin/electron-builder install-app-deps && export SNAPCRAFT_BUILD_ENVIRONMENT=host && export SNAP_DESTRUCTIVE_MODE='true' && ./node_modules/.bin/electron-builder -l && npm run zip",
     "dist2": "npm run monkeypatch && export USE_SYSTEM_FPM=true && ./node_modules/.bin/electron-builder install-app-deps && export SNAPCRAFT_BUILD_ENVIRONMENT=host && export SNAP_DESTRUCTIVE_MODE='true' && ./node_modules/.bin/electron-builder -mwl && npm run zip",
     "dist2": "npm run monkeypatch && export USE_SYSTEM_FPM=true && ./node_modules/.bin/electron-builder install-app-deps && export SNAPCRAFT_BUILD_ENVIRONMENT=host && export SNAP_DESTRUCTIVE_MODE='true' && ./node_modules/.bin/electron-builder -mwl && npm run zip",
     "zip": "node script/zip",
     "zip": "node script/zip",
@@ -26,6 +24,7 @@
   "build": {
   "build": {
     "appId": "computer.pinokio",
     "appId": "computer.pinokio",
     "afterPack": "chmod.js",
     "afterPack": "chmod.js",
+		"afterSign": "electron-builder-notarize",
     "directories": {
     "directories": {
       "output": "dist-${platform}"
       "output": "dist-${platform}"
     },
     },
@@ -78,7 +77,8 @@
             "arm64"
             "arm64"
           ]
           ]
         }
         }
-      ]
+      ],
+			"hardenedRuntime": true
     },
     },
     "linux": {
     "linux": {
       "maintainer": "Cocktail Peanut <cocktailpeanuts@proton.me>",
       "maintainer": "Cocktail Peanut <cocktailpeanuts@proton.me>",
@@ -122,11 +122,12 @@
   "dependencies": {
   "dependencies": {
     "electron-store": "^8.1.0",
     "electron-store": "^8.1.0",
     "electron-window-state": "^5.0.3",
     "electron-window-state": "^5.0.3",
-    "pinokiod": "^3.20.0"
+    "pinokiod": "^3.20.1"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "@electron/rebuild": "3.2.10",
     "@electron/rebuild": "3.2.10",
     "electron": "^23.1.2",
     "electron": "^23.1.2",
-    "electron-builder": "^26.0.18"
+    "electron-builder": "^26.0.18",
+    "electron-builder-notarize": "^1.5.2"
   }
   }
 }
 }