recover from rebase fail to avoid manual cleanup of git dir
Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
parent
40ec6ec47e
commit
2e57b1b8cf
|
@ -28,7 +28,13 @@ timeout(90) {
|
||||||
slackSend color: 'good', message: BRANCH_NAME + '(' + env.CHANGE_BRANCH + ') build started. ' + env.BUILD_URL
|
slackSend color: 'good', message: BRANCH_NAME + '(' + env.CHANGE_BRANCH + ') build started. ' + env.BUILD_URL
|
||||||
|
|
||||||
checkout scm
|
checkout scm
|
||||||
sh 'git rebase origin/develop'
|
|
||||||
|
try {
|
||||||
|
sh 'git rebase origin/desktop'
|
||||||
|
} catch (e) {
|
||||||
|
sh 'git rebase --abort'
|
||||||
|
throw e
|
||||||
|
}
|
||||||
|
|
||||||
sh 'rm -rf node_modules'
|
sh 'rm -rf node_modules'
|
||||||
sh 'cp .env.jenkins .env'
|
sh 'cp .env.jenkins .env'
|
||||||
|
|
Loading…
Reference in New Issue