status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-01-11 03:26:31 +00:00
Code Issues Projects Releases Wiki Activity

recover from rebase fail to avoid manual cleanup of git dir

Browse Source 
Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2018-07-19 15:43:39 +02:00
parent 40ec6ec47e
commit 2e57b1b8cf
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Jenkinsfile vendored
View File

@ -28,7 +28,13 @@ timeout(90) {
slackSend color: 'good', message: BRANCH_NAME + '(' + env.CHANGE_BRANCH + ') build started. ' + env.BUILD_URL
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 'cp .env.jenkins .env'