Skip to content

Commit 19e1801

Browse files
committed
fix fatal: ambiguous argument 'develop..':...
1 parent 518f68f commit 19e1801

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

Diff for: Jenkinsfile

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ node ('macos1') {
1717

1818
git([url: 'https://github.com/status-im/status-react.git', branch: BRANCH_NAME])
1919

20+
sh 'git checkout -- .'
21+
sh 'git checkout develop'
2022
sh 'git checkout ' + BRANCH_NAME
2123
sh 'rm -rf node_modules'
2224
sh 'cp .env.jenkins .env'

Diff for: Jenkinsfile.nightly

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ node ('macos1'){
1919
git([url: 'https://github.com/status-im/status-react.git', branch: 'develop'])
2020
// Checkout master because used for iOS Plist version information
2121
sh 'git fetch --tags'
22-
sh 'git checkout ' + 'develop'
22+
sh 'git checkout -- .'
23+
sh 'git checkout develop'
2324
sh 'rm -rf node_modules'
2425
sh 'cp .env.jenkins .env'
2526
sh 'lein deps && npm install && ./re-natal deps'

Diff for: Jenkinsfile.parameters

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ node ('macos1') {
1616
git([url: 'https://github.com/' + REPO + '/status-react.git', branch: BRANCH_NAME])
1717
// Checkout master because used for iOS Plist version information
1818
sh 'git checkout -- .'
19-
sh 'git checkout master'
19+
sh 'git checkout develop'
2020
sh 'git checkout ' + BRANCH_NAME
2121
sh 'rm -rf node_modules'
2222

@@ -109,4 +109,4 @@ node ('macos1') {
109109
slackSend color: 'bad', message: REPO + ":" + BRANCH_NAME + ' failed to build. ' + env.BUILD_URL
110110
throw e
111111
}
112-
}
112+
}

0 commit comments

Comments
 (0)