fail if nonzero exit

wilg · Sep 24, 2022 · 4c4cb5d · 4c4cb5d
1 parent 699039e
commit 4c4cb5d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/index.ts b/src/index.ts
@@ -22,19 +22,22 @@ async function runMain() {
       await CloudRunner.run(buildParameters, baseImage.toString());
     } else {
       core.info('Building locally');
+      let exitCode: number;
       await PlatformSetup.setup(buildParameters, actionFolder);
       if (process.platform === 'darwin') {
-        MacBuilder.run(actionFolder, workspace, buildParameters);
+        exitCode = await MacBuilder.run(actionFolder, workspace, buildParameters);
       } else {
-        console.log('[node] running docker');
-        await Docker.run(baseImage, { workspace, actionFolder, ...buildParameters });
-        console.log('[node] docker exited');
+        exitCode = await Docker.run(baseImage, { workspace, actionFolder, ...buildParameters });
+      }
+      if (exitCode !== 0) {
+        core.setFailed(`Build failed with exit code ${exitCode}`);
+
+        return;
       }
     }
 
     // Set output
     await Output.setBuildVersion(buildParameters.buildVersion);
-    console.log('[node] Output.setBuildVersion completed');
 
   } catch (error) {
     core.setFailed((error as Error).message);

diff --git a/src/model/docker.ts b/src/model/docker.ts
@@ -13,7 +13,8 @@ class Docker {
       case 'win32':
         runCommand = this.getWindowsCommand(image, parameters);
     }
-    await exec(runCommand, undefined, { silent });
+
+    return await exec(runCommand, undefined, { silent });
   }
 
   static getLinuxCommand(image, parameters): string {

diff --git a/src/model/mac-builder.ts b/src/model/mac-builder.ts
@@ -3,9 +3,8 @@ import { BuildParameters } from '.';
 
 class MacBuilder {
   public static async run(actionFolder, workspace, buildParameters: BuildParameters, silent = false) {
-    await exec('bash', [`${actionFolder}/platforms/mac/entrypoint.sh`], {
+    return await exec('bash', [`${actionFolder}/platforms/mac/entrypoint.sh`], {
       silent,
-      ignoreReturnCode: false,
     });
   }
 }