From bc6cb6e2b447b8a98b631e2f014aff9d4a7ff48f Mon Sep 17 00:00:00 2001
From: Kaloyan Manolov <kmanolov@asteasolutions.com>
Date: Wed, 7 May 2025 16:38:27 +0300
Subject: [PATCH] fix: provide teamid to notarytool
---
.github/workflows/ci-cd.yml | 2 ++
fastlane/Appfile | 6 +++---
scripts/afterSign.js | 1 +
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 2c0f435..56ecde1 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -28,6 +28,8 @@ jobs:
SCRATCH_SHOULD_SIGN: ${{ github.ref_name == 'develop' && matrix.os != 'windows-latest' }}
AC_USERNAME: ${{ (github.ref_name == 'develop' && secrets.AC_USERNAME) || '' }}
AC_PASSWORD: ${{ (github.ref_name == 'develop' && secrets.AC_PASSWORD) || '' }}
+ # Required for notarization on Mac
+ AC_TEAM_ID: ${{ secrets.AC_TEAM_ID || 'W7AR3WMP87' }}
steps:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
- uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
diff --git a/fastlane/Appfile b/fastlane/Appfile
index 72de007..c3b58d6 100644
--- a/fastlane/Appfile
+++ b/fastlane/Appfile
@@ -1,3 +1,3 @@
-app_identifier "edu.mit.scratch.scratch-desktop" # The bundle identifier of your app
-apple_id "bot-apple@scratch.mit.edu" # Your Apple email address
-team_id "W7AR3WMP87"
+app_identifier("edu.mit.scratch.scratch-desktop") # The bundle identifier of your app
+apple_id("bot-apple@scratch.mit.edu") # Your Apple email address
+team_id(ENV.fetch("AC_TEAM_ID"))
diff --git a/scripts/afterSign.js b/scripts/afterSign.js
index e80e31c..4bfcca8 100644
--- a/scripts/afterSign.js
+++ b/scripts/afterSign.js
@@ -30,6 +30,7 @@ const notarizeMacBuild = async function (context) {
appPath: `${appOutDir}/${productFilename}.app`,
appleId,
appleIdPassword: process.env.AC_PASSWORD || `@keychain:${appleIdKeychainItem}`,
+ teamId: process.env.AC_TEAM_ID || '',
tool: 'notarytool'
});
};