Merge branch 'main' into develop

klembot · Nov 27, 2023 · d36cec7 · d36cec7
2 parents 051e845 + b86f316
commit d36cec7
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 17,103 deletions.
diff --git a/README.md b/README.md
@@ -50,6 +50,7 @@ build:
 - `APPLE_ID`: User name of the Apple account to use for notarization.
 - `APPLE_ID_PASSWORD`: App-specific password for the Apple account to use for
   notarization.
+- `APPLE_TEAM_ID`: ID of the Apple team account to use for notarization.
 
 If any of these environment variables are not set, the build process will skip
 notarizing. This means users will need to right-click the application and open

diff --git a/electron-builder.config.js b/electron-builder.config.js
@@ -29,12 +29,20 @@ module.exports = {
 				return;
 			}
 
+			if (!('APPLE_TEAM_ID' in process.env)) {
+				console.log(
+					'APPLE_TEAM_ID environment variable is not set, skipping notarization'
+				);
+				return;
+			}
+
 			console.log('Notarizing Mac app...');
 			await notarize({
 				appBundleId: process.env.APPLE_APP_ID,
 				appPath: path.join(context.appOutDir, `Twine.app`),
 				appleId: process.env.APPLE_ID,
-				appleIdPassword: process.env.APPLE_ID_PASSWORD
+				appleIdPassword: process.env.APPLE_ID_PASSWORD,
+				teamId: process.env.APPLE_TEAM_ID
 			});
 		}
 	},