From 986bdf8e24f3ec5813dd1b97608282ccc2349ccc Mon Sep 17 00:00:00 2001
From: Eugene Pankov <john.pankov@gmail.com>
Date: Thu, 27 Jun 2019 11:47:57 +0200
Subject: [PATCH] handle build errors

---
 azure-pipelines.yml        | 1 -
 build/mac/afterSignHook.js | 2 +-
 scripts/build-linux.js     | 2 +-
 scripts/build-macos.js     | 2 +-
 scripts/build-native.js    | 6 ++++--
 scripts/build-windows.js   | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d4994efa..b2edded0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -181,7 +181,6 @@ jobs:
       GH_TOKEN: $(GH_TOKEN)
       APPSTORE_USERNAME: $(APPSTORE_USERNAME)
       APPSTORE_PASSWORD: $(APPSTORE_PASSWORD)
-      BRANCH: $(BUILD_SOURCEBRANCH)
 
   - task: CopyFiles@2
     inputs:
diff --git a/build/mac/afterSignHook.js b/build/mac/afterSignHook.js
index bfd6bbbb..85189ff6 100644
--- a/build/mac/afterSignHook.js
+++ b/build/mac/afterSignHook.js
@@ -7,7 +7,7 @@ const notarizer = require('electron-notarize')
 module.exports = async function (params) {
     console.log('env: ', process.env)
     // notarize the app on Mac OS only.
-    if (process.platform !== 'darwin'){// || process.env.BRANCH !== 'refs/heads/master') {
+    if (process.platform !== 'darwin' || process.env.BUILD_SOURCEBRANCH !== 'refs/heads/master') {
         return
     }
     console.log('afterSign hook triggered', params)
diff --git a/scripts/build-linux.js b/scripts/build-linux.js
index fd159a1a..4ad7ff20 100755
--- a/scripts/build-linux.js
+++ b/scripts/build-linux.js
@@ -11,4 +11,4 @@ builder({
     },
   },
   publish: 'onTag',
-})
+}).catch(() => process.exit(1))
diff --git a/scripts/build-macos.js b/scripts/build-macos.js
index a116f852..7e3aea09 100755
--- a/scripts/build-macos.js
+++ b/scripts/build-macos.js
@@ -11,4 +11,4 @@ builder({
     },
   },
   publish: 'onTag',
-})
+}).catch(() => process.exit(1))
diff --git a/scripts/build-native.js b/scripts/build-native.js
index f9dd24bc..025029ae 100755
--- a/scripts/build-native.js
+++ b/scripts/build-native.js
@@ -5,11 +5,13 @@ const vars = require('./vars')
 
 lifecycles = []
 for (let dir of ['app', 'terminus-core', 'terminus-ssh', 'terminus-terminal']) {
-  lifecycles.push([rebuild({
+  build = rebuild({
     buildPath: path.resolve(__dirname, '../' + dir),
     electronVersion: vars.electronVersion,
     force: true,
-  }).lifecycle, dir])
+  })
+  build.catch(() => process.exit(1))
+  lifecycles.push([build.lifecycle, dir])
 }
 
 console.info('Building against Electron', vars.electronVersion)
diff --git a/scripts/build-windows.js b/scripts/build-windows.js
index f55a0c08..4b0e6bc3 100755
--- a/scripts/build-windows.js
+++ b/scripts/build-windows.js
@@ -11,4 +11,4 @@ builder({
     },
   },
   publish: 'onTag',
-})
+}).catch(() => process.exit(1))