提交 517b77e9 编写于 作者: L liuyq-617

fix

上级 65ebf173
...@@ -46,13 +46,20 @@ def pre_test(){ ...@@ -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(){ ...@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册