diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d102f01..8f52f8a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,21 +26,21 @@ jobs: - name: Import Apple Developer Certificate (macOS only) if: matrix.os == 'macos-latest' env: - DEVELOPER_ID_CERT: ${{ secrets.DEVELOPER_ID_CERT }} - DEVELOPER_ID_CERT_PASSWORD: ${{ secrets.DEVELOPER_ID_CERT_PASSWORD }} - CSC_NAME: ${{ secrets.CSC_NAME }} + DEVELOPER_ID_CERT: ${{ secrets.DEVELOPER_ID_CERT }} + DEVELOPER_ID_CERT_PASSWORD: ${{ secrets.DEVELOPER_ID_CERT_PASSWORD }} + CSC_NAME: ${{ secrets.CSC_NAME }} run: | - echo "$DEVELOPER_ID_CERT" | base64 --decode > developer_id_certificate.p12 - security create-keychain -p "" build.keychain - security default-keychain -s build.keychain - security unlock-keychain -p "" build.keychain - security import developer_id_certificate.p12 -k build.keychain -P "$DEVELOPER_ID_CERT_PASSWORD" -T /usr/bin/codesign - security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "" build.keychain + echo "$DEVELOPER_ID_CERT" | base64 --decode > developer_id_certificate.p12 + security create-keychain -p "" build.keychain + security default-keychain -s build.keychain + security unlock-keychain -p "" build.keychain + security import developer_id_certificate.p12 -k build.keychain -P "$DEVELOPER_ID_CERT_PASSWORD" -T /usr/bin/codesign + security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "" build.keychain - name: List Certificates in Keychain (macOS only) if: matrix.os == 'macos-latest' run: | - security find-identity -v -p codesigning + security find-identity -v -p codesigning - name: Build and Release uses: samuelmeuli/action-electron-builder@v1.6.0 @@ -48,7 +48,9 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} release: true env: - DEBUG: electron-notarize - APPLE_ID: ${{ secrets.APPLE_ID }} - APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} - CSC_NAME: ${{ secrets.CSC_NAME }} + DEBUG: electron-notarize* + APPLE_ID: ${{ secrets.APPLE_ID }} + APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} + APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} + CSC_NAME: ${{ secrets.CSC_NAME }} diff --git a/package.json b/package.json index 7a864d3..fb00e89 100644 --- a/package.json +++ b/package.json @@ -37,9 +37,6 @@ "NSApplicationSupportsSecureRestorableState": true, "electronTeamId": "R2PY2DC3A4" }, - "notarize": { - "teamId": "R2PY2DC3A4" - }, "hardenedRuntime": true, "gatekeeperAssess": true, "entitlements": "entitlements.mac.plist",