gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated Jenkinsfile for iOS build

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

23
Jenkinsfile vendored
View File

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

1
src/tap.cpp
View File

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