From ab86fc0cefd5d8b3715712a4dd234bbe45f18cc2 Mon Sep 17 00:00:00 2001
From: siepra <wiktor.siepra@gmail.com>
Date: Fri, 17 Nov 2023 14:30:38 +0100
Subject: [PATCH 1/2] fix: pass team id for notarization
---
.github/workflows/build-release.yml | 1 +
packages/desktop/scripts/notarize.js | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index cccdbde5a0..5ce5565e36 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -131,6 +131,7 @@ jobs:
CSC_LINK: ${{ secrets.MAC_CSC_LINK }}
APPLEID: ${{ secrets.APPLE_ID }}
APPLEIDPASS: ${{ secrets.APPLE_ID_PASS }}
+ TEAMID: ${{ secrets.APPLE_TEAM_ID }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
USE_HARD_LINKS: false
diff --git a/packages/desktop/scripts/notarize.js b/packages/desktop/scripts/notarize.js
index f60c6b64e1..733efda08e 100644
--- a/packages/desktop/scripts/notarize.js
+++ b/packages/desktop/scripts/notarize.js
@@ -12,10 +12,12 @@ exports.default = async function notarizing(context) {
console.log('notarization start')
try {
const response = await notarize({
+ tool: 'notarytool',
appBundleId: 'com.yourcompany.yourAppId',
appPath: `${appOutDir}/${appName}.app`,
appleId: process.env.APPLEID,
- appleIdPassword: process.env.APPLEIDPASS
+ appleIdPassword: process.env.APPLEIDPASS,
+ teamId: process.env.TEAMID
})
console.log('notarization done')
return response
From 6b5f66434c95b8571656ce550d4cfcd672811a4f Mon Sep 17 00:00:00 2001
From: siepra <wiktor.siepra@gmail.com>
Date: Fri, 17 Nov 2023 14:32:01 +0100
Subject: [PATCH 2/2] chore: prefix team id env
---
.github/workflows/build-release.yml | 2 +-
packages/desktop/scripts/notarize.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 5ce5565e36..1fb70c9ed1 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -131,7 +131,7 @@ jobs:
CSC_LINK: ${{ secrets.MAC_CSC_LINK }}
APPLEID: ${{ secrets.APPLE_ID }}
APPLEIDPASS: ${{ secrets.APPLE_ID_PASS }}
- TEAMID: ${{ secrets.APPLE_TEAM_ID }}
+ APPLETEAMID: ${{ secrets.APPLE_TEAM_ID }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
USE_HARD_LINKS: false
diff --git a/packages/desktop/scripts/notarize.js b/packages/desktop/scripts/notarize.js
index 733efda08e..031e5ad157 100644
--- a/packages/desktop/scripts/notarize.js
+++ b/packages/desktop/scripts/notarize.js
@@ -17,7 +17,7 @@ exports.default = async function notarizing(context) {
appPath: `${appOutDir}/${appName}.app`,
appleId: process.env.APPLEID,
appleIdPassword: process.env.APPLEIDPASS,
- teamId: process.env.TEAMID
+ teamId: process.env.APPLETEAMID
})
console.log('notarization done')
return response