Merge branch 'master' into dev

aolsenjazz · Sep 19, 2024 · 06e8b3d · 06e8b3d
2 parents 153f3fc + e52325f
commit 06e8b3d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.erb/scripts/notarize.js b/.erb/scripts/notarize.js
@@ -22,9 +22,11 @@ exports.default = async function notarizeMacos(context) {
   const appName = context.packager.appInfo.productFilename;
 
   await notarize({
+    tool: 'notarytool',
     appBundleId: build.appId,
     appPath: `${appOutDir}/${appName}.app`,
     appleId: process.env.APPLE_ID,
     appleIdPassword: process.env.APPLE_ID_PASS,
+    teamId: process.env.APPLE_TEAM_ID,
   });
 };
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -4,10 +4,6 @@ on:
   push:
     branches:
       - master
-  workflow_run:
-    workflows: ['Test']
-    types:
-      - completed
 
 jobs:
   publish:
@@ -40,6 +36,7 @@ jobs:
           # These values are used for auto updates signing
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_ID_PASS: ${{ secrets.APPLE_SINGLE_APP_SUPER_CONTROLLER }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
           # This is used for uploading release assets to github