fix error

This commit is contained in:
liuyq-617 2020-12-28 10:58:29 +08:00
parent d75b9505ef
commit 8c82e18fb8
1 changed files with 7 additions and 1 deletions

8
Jenkinsfile vendored
View File

@ -43,7 +43,13 @@ def pre_test(){
git checkout develop
git pull
git fetch
git branch -D ${CHANGE_BRANCH}
'''
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
sh '''
git branch -D ${CHANGE_BRANCH}
'''
}
git checkout ${CHANGE_BRANCH}
git pull
git merge develop