macOS: Make both notarize() calls consistent

signalapp · Oct 30, 2023 · 8045e97 · 8045e97
1 parent cb0517d
commit 8045e97
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/ts/scripts/notarize-universal-dmg.ts b/ts/scripts/notarize-universal-dmg.ts
@@ -47,6 +47,14 @@ export async function afterAllArtifactBuild({
     return;
   }
 
+  const teamId = process.env.APPLE_TEAM_ID;
+  if (!teamId) {
+    console.warn(
+      'teamId must be provided in environment variable APPLE_TEAM_ID'
+    );
+    return;
+  }
+
   const artifactsToStaple = artifactPaths.filter(artifactPath =>
     /^.*mac-universal.*\.dmg$/.test(artifactPath)
   );
@@ -57,10 +65,12 @@ export async function afterAllArtifactBuild({
 
   const [dmgPath] = artifactsToStaple;
   console.log(`Notarizing dmg: ${dmgPath}`);
+
   await notarize({
     appBundleId,
     appPath: dmgPath,
     appleId,
     appleIdPassword,
+    teamId,
   });
 }
diff --git a/ts/scripts/notarize.ts b/ts/scripts/notarize.ts
@@ -59,7 +59,7 @@ export async function afterSign({
   console.log(`  file: ${appPath}`);
 
   await notarize({
-    tool: 'notarytool',
+    appBundleId,
     appPath,
     appleId,
     appleIdPassword,