Zip the correct executable

Author: durran

packages/build/src/compile-exec.ts

@@ -68,7 +68,7 @@ const executablePath = (outputDir: string, platform: string): string => {
  * @param {string} outputDir - The output directory for the executable.
  * @param {string} platform - The platform.
  */
-const compileExec = async(input: string, outputDir: string, platform: string) => {
+const compileExec = async(input: string, outputDir: string, platform: string): Promise<string> => {
   const executable = executablePath(outputDir, platform);
   console.log('mongosh: creating binary:', executable);
   await compile([
@@ -78,6 +78,7 @@ const compileExec = async(input: string, outputDir: string, platform: string) =>
     '-t',
     determineTarget(platform)
   ]);
+  return executable;
 };
 
 export default compileExec;

packages/build/src/release.ts

@@ -24,12 +24,12 @@ const release = async(config: Config) => {
   });
 
   // - Build the executable.
-  await compileExec(config.input, config.outputDir, platform);
+  const executable = await compileExec(config.input, config.outputDir, platform);
 
   // - Sign the executable
 
   // - Zip the executable.
-  const artifact = await zip(config.input, config.outputDir, platform, config.version);
+  const artifact = await zip(executable, config.outputDir, platform, config.version);
 
   if (platform === Platform.MacOs) {
     // - Notarize the zip.

packages/build/src/zip.ts

@@ -45,10 +45,10 @@ const zipPosix = async(outputDir: string, filename: string) => {
  * @param {string} input - The file to zip.
  * @param {string} filename - the zip filename.
  */
-const zipWindows = async(input: string, filename: string) => {
+const zipWindows = (input: string, filename: string) => {
   const admZip = new AdmZip();
   admZip.addLocalFile(input)
-  await admZip.writeZip(filename);
+  admZip.writeZip(filename);
 };
 
 /**
@@ -67,7 +67,7 @@ const zip = async(input: string, outputDir: string, platform: string, version: s
   if (platform === Platform.Linux) {
     await zipPosix(outputDir, filename);
   } else {
-    await zipWindows(input, filename);
+    zipWindows(input, filename);
   }
   return filename;
 };