From 20effb7cd1f2f00e703c188e6dcf2f9b46a60fad Mon Sep 17 00:00:00 2001 From: Ivan Borovkov Date: Mon, 1 Jan 2018 10:22:11 +0200 Subject: [PATCH 1/3] fixed jenkinsfile checkout process --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1bbef0866a..1cabca17ed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ node ('macos1') { checkout scm sh 'git checkout -- .' sh 'git checkout develop' - sh 'git checkout ' + BRANCH_NAME + sh 'git checkout remotes/origin/' + BRANCH_NAME sh 'rm -rf node_modules' sh 'cp .env.jenkins .env' From 2ce5e2a71503e4271efd2361f384b02f0e151a07 Mon Sep 17 00:00:00 2001 From: Ivan Borovkov Date: Mon, 1 Jan 2018 10:46:42 +0200 Subject: [PATCH 2/3] fixed jenkinsfile checkout process --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1cabca17ed..fb52c07efb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,7 +22,8 @@ node ('macos1') { sh 'rm -rf node_modules' sh 'cp .env.jenkins .env' - sh 'lein deps && npm install' + sh 'lein deps' + sh 'npm install' sh '[ -f node_modules/react-native/packager/src/JSTransformer/index.js ] && sed -i "" "s/301000/1201000/g" node_modules/react-native/packager/src/JSTransformer/index.js || echo "New packager"' // Fix silly RN upgrade weird env issue From 7cd7072d33f9da905e9104bb3ab4b47362677c12 Mon Sep 17 00:00:00 2001 From: Ivan Borovkov Date: Mon, 1 Jan 2018 10:54:49 +0200 Subject: [PATCH 3/3] fixed jenkinsfile checkout process --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fb52c07efb..acb14492bc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,8 +22,7 @@ node ('macos1') { sh 'rm -rf node_modules' sh 'cp .env.jenkins .env' - sh 'lein deps' - sh 'npm install' + sh 'lein deps && npm install' sh '[ -f node_modules/react-native/packager/src/JSTransformer/index.js ] && sed -i "" "s/301000/1201000/g" node_modules/react-native/packager/src/JSTransformer/index.js || echo "New packager"' // Fix silly RN upgrade weird env issue @@ -31,6 +30,7 @@ node ('macos1') { sh 'mvn -f modules/react-native-status/ios/RCTStatus dependency:unpack' sh 'cd ios && pod install && cd ..' + sh 'npm install' } stage('Tests') {