From 19e180179c4f4a8deb76094887c57ceb902e676b Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Mon, 11 Dec 2017 16:08:10 +0200 Subject: [PATCH] fix fatal: ambiguous argument 'develop..':... --- Jenkinsfile | 2 ++ Jenkinsfile.nightly | 3 ++- Jenkinsfile.parameters | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3e035b023d..27c3249ae2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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' diff --git a/Jenkinsfile.nightly b/Jenkinsfile.nightly index 400c8b2a67..c925fd60a9 100644 --- a/Jenkinsfile.nightly +++ b/Jenkinsfile.nightly @@ -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' diff --git a/Jenkinsfile.parameters b/Jenkinsfile.parameters index 6dadb927a8..4f3d3fa808 100644 --- a/Jenkinsfile.parameters +++ b/Jenkinsfile.parameters @@ -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 } -} \ No newline at end of file +}