xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix

This commit is contained in:
liuyq-617 2021-04-07 09:46:09 +08:00
parent 65ebf17311
commit 517b77e903
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Jenkinsfile vendored
View File

@ -46,13 +46,20 @@ def pre_test(){
''' '''
script { script {
if (env.CHANGE_TARGET == 'master') { if (env.CHANGE_TARGET == 'master') {
sh 'git checkout master' sh '''
cd ${WKC}
git checkout master
'''
} }
else { else {
sh 'git checkout develop' sh '''
cd ${WKC}
git checkout develop
'''
} }
} }
sh''' sh'''
cd ${WKC}
git pull >/dev/null git pull >/dev/null
git fetch origin +refs/pull/${CHANGE_ID}/merge git fetch origin +refs/pull/${CHANGE_ID}/merge
git checkout -qf FETCH_HEAD git checkout -qf FETCH_HEAD
@ -62,15 +69,21 @@ def pre_test(){
''' '''
script { script {
if (env.CHANGE_TARGET == 'master') { if (env.CHANGE_TARGET == 'master') {
sh 'git checkout master' sh '''
cd ${WKC}
git checkout master
'''
} }
else { else {
sh 'git checkout develop' sh '''
cd ${WKC}
git checkout develop
'''
} }
} }
sh ''' sh '''
git pull >/dev/null
cd ${WK} cd ${WK}
git pull >/dev/null
export TZ=Asia/Harbin export TZ=Asia/Harbin
date date
git clean -dfx git clean -dfx