Pass our zip directly to notarizer

Author: durran

packages/build/src/github.ts

@@ -77,7 +77,7 @@ const createRelease = async(version: string, octokit: Octokit): Promise<any> =>
  * @param {string} uploadUrl - The release endpoint.
  * @param {Octokit} octokit - The octokit instance.
  */
-const uploadAsset = async(artifact: string, platform: string, uploadUrl: string, octokit: Octokit) Promise<any> => {
+const uploadAsset = async(artifact: string, platform: string, uploadUrl: string, octokit: Octokit): Promise<any> => {
   const params = {
     method: 'POST',
     url: uploadUrl,

packages/build/src/macos-sign.ts

@@ -3,11 +3,12 @@ import util from 'util';
 import codesign from 'node-codesign';
 import { notarize as nodeNotarize } from 'electron-notarize';
 import Config from './config';
+import zip from './zip';
 
-const notarize = (bundleId: string, executable: string, user: string, password: string) => {
+const notarize = (bundleId: string, artifact: string, user: string, password: string) => {
   return nodeNotarize({
     appBundleId: bundleId,
-    appPath: executable,
+    appPath: artifact,
     appleId: user,
     appleIdPassword: password
   });
@@ -25,22 +26,19 @@ const sign = (executable: string, identity: string) => {
   });
 };
 
-const publish = async(executable: string, artifact: string, config: Config) => {
-  // Remove the zip that was created since the notarize process will create a
-  // new zip.
+const publish = async(executable: string, artifact: string, platform: string, config: Config) => {
   console.log('mongosh: removing unsigned zip:', artifact);
   await util.promisify(fs.unlink)(artifact);
   console.log('mongosh: signing:', executable);
   await sign(executable, config.appleAppIdentity).
     catch((e) => { console.error(e); throw e; });
   console.log('mongosh: notarizing and zipping:', executable);
+  await zip(executable, config.outputDir, platform, config.version);
   await notarize(
     config.bundleId,
-    executable,
+    artifact,
     config.appleUser,
     config.applePassword).catch((e) => { console.error(e); throw e; });
-  console.log('mongosh: renaming notarized zip:', artifact);
-  await util.promisify(fs.rename)(`${executable}.zip`, artifact);
 };
 
 export default publish;

packages/build/src/release.ts

@@ -39,7 +39,7 @@ const release = async(config: Config) => {
 
   // Sign and notarize the executable and artifact for MacOs.
   if (platform === Platform.MacOs) {
-    await publishMacOs(executable, artifact, config);
+    await publishMacOs(executable, artifact, platform, config);
   }
 
   // Create & sign the .rpm (only on linux)