Updated Jenkinsfile for iOS build

This commit is contained in:
Joseph Henry
2016-11-04 11:06:13 -07:00
parent cfb36ae895
commit 752b340b5b
2 changed files with 11 additions and 13 deletions

23
Jenkinsfile vendored
View File

@@ -32,7 +32,6 @@ parallel 'centos7': {
throw err
}
// service (picoTCP IPv4)
try {
checkout scm
@@ -102,17 +101,17 @@ parallel 'centos7': {
}
// ios_app_framework
//try {
// checkout scm
// stage('Build iOS App Framework') {
// sh 'make ios_app_framework'
// }
//}
//catch (err) {
// currentBuild.result = "FAILURE"
// slackSend color: '#ff0000', message: "${env.JOB_NAME} broken on iOS (<${env.BUILD_URL}|Open>)"
// throw err
//}
try {
checkout scm
stage('Build iOS App Framework') {
sh 'make ios_app_framework'
}
}
catch (err) {
currentBuild.result = "FAILURE"
slackSend color: '#ff0000', message: "${env.JOB_NAME} broken on iOS (<${env.BUILD_URL}|Open>)"
throw err
}
}
}

View File

@@ -395,7 +395,6 @@ void NetconEthernetTap::phyOnUnixData(PhySocket *sock, void **uptr, void *data,
// Find job
sockdata = jobmap[CANARY_num];
if(!sockdata.first) {
DEBUG_ERROR("unable to locate job entry for %lu, sock=%p", CANARY_num, (void*)&sock);
return;
} else
foundJob = true;