status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix fatal: ambiguous argument 'develop..':...

This commit is contained in:
Roman Volosovskyi 2017-12-11 16:08:10 +02:00
parent 518f68f08f
commit 19e180179c
No known key found for this signature in database
GPG Key ID: 37135489EAE4B2D7
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -17,6 +17,8 @@ node ('macos1') {
git([url: 'https://github.com/status-im/status-react.git', branch: BRANCH_NAME])
sh 'git checkout -- .'
sh 'git checkout develop'
sh 'git checkout ' + BRANCH_NAME
sh 'rm -rf node_modules'
sh 'cp .env.jenkins .env'

3
Jenkinsfile.nightly
View File

@ -19,7 +19,8 @@ node ('macos1'){
git([url: 'https://github.com/status-im/status-react.git', branch: 'develop'])
// Checkout master because used for iOS Plist version information
sh 'git fetch --tags'
sh 'git checkout ' + 'develop'
sh 'git checkout -- .'
sh 'git checkout develop'
sh 'rm -rf node_modules'
sh 'cp .env.jenkins .env'
sh 'lein deps && npm install && ./re-natal deps'

4
Jenkinsfile.parameters
View File

@ -16,7 +16,7 @@ node ('macos1') {
git([url: 'https://github.com/' + REPO + '/status-react.git', branch: BRANCH_NAME])
// Checkout master because used for iOS Plist version information
sh 'git checkout -- .'
sh 'git checkout master'
sh 'git checkout develop'
sh 'git checkout ' + BRANCH_NAME
sh 'rm -rf node_modules'
@ -109,4 +109,4 @@ node ('macos1') {
slackSend color: 'bad', message: REPO + ":" + BRANCH_NAME + ' failed to build. ' + env.BUILD_URL
throw e
}
}
}