Browse Source

handle build errors

Eugene Pankov 6 years ago
parent
commit
986bdf8e24

+ 0 - 1
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:

+ 1 - 1
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)

+ 1 - 1
scripts/build-linux.js

@@ -11,4 +11,4 @@ builder({
     },
   },
   publish: 'onTag',
-})
+}).catch(() => process.exit(1))

+ 1 - 1
scripts/build-macos.js

@@ -11,4 +11,4 @@ builder({
     },
   },
   publish: 'onTag',
-})
+}).catch(() => process.exit(1))

+ 4 - 2
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)

+ 1 - 1
scripts/build-windows.js

@@ -11,4 +11,4 @@ builder({
     },
   },
   publish: 'onTag',
-})
+}).catch(() => process.exit(1))