From 54e25084feb1d5994650d3e104c56e8de48ce3f9 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Thu, 21 Nov 2019 14:51:33 -0800 Subject: [PATCH] re-enable CI on master --- Jenkinsfile | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 88989327..edb0c69e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,26 +40,26 @@ parallel 'centos7': { // throw err // } // } -// }, 'macOS': { -// node('macOS') { -// try { -// checkout scm +}, 'macOS': { + node('macOS') { + try { + checkout scm -// stage('Build macOS') { -// sh 'make -f make-mac.mk' -// } + stage('Build macOS') { + sh 'make -f make-mac.mk' + } -// stage('Build macOS UI') { -// sh 'cd macui && xcodebuild -target "ZeroTier One" -configuration Debug' -// } -// } -// catch (err) { -// currentBuild.result = "FAILURE" -// mattermostSend color: '#ff0000', message: "${env.JOB_NAME} broken on macOS (<${env.BUILD_URL}|Open>)" + stage('Build macOS UI') { + sh 'cd macui && xcodebuild -target "ZeroTier One" -configuration Debug' + } + } + catch (err) { + currentBuild.result = "FAILURE" + mattermostSend color: '#ff0000', message: "${env.JOB_NAME} broken on macOS (<${env.BUILD_URL}|Open>)" -// throw err -// } -// } + throw err + } + } // }, 'windows': { // node('windows') { // try {