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

Merge pull request #4740 from taosdata/test/jenkins 

fix some errors
This commit is contained in:
huili 2020-12-28 11:19:03 +08:00 committed by GitHub
parent a2d974cf9e 8c82e18fb8
commit ee391dfc6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Jenkinsfile vendored
View File

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