re-enable CI on master

This commit is contained in:
Grant Limberg 2019-11-21 14:51:33 -08:00
parent e58a0b3efb
commit 54e25084fe
No known key found for this signature in database
GPG Key ID: 2BA62CCABBB4095A

34
Jenkinsfile vendored
View File

@ -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 {