From e8c43e2a2c693554ffce2861999386e8f47ed3c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Thu, 9 Aug 2018 08:37:36 -0400 Subject: [PATCH] use password for the right host, run before xcodebuild Signed-off-by: Igor Mandrigin --- ci/Jenkinsfile.nightly_fastlane | 9 +++++---- ci/Jenkinsfile.upload_release_ios | 7 +++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ci/Jenkinsfile.nightly_fastlane b/ci/Jenkinsfile.nightly_fastlane index 3d79b84928..da7e171adb 100644 --- a/ci/Jenkinsfile.nightly_fastlane +++ b/ci/Jenkinsfile.nightly_fastlane @@ -74,14 +74,15 @@ timeout(90) { } stage('Build (iOS)') { - withCredentials([ - string(credentialsId: 'jenkins_pass', variable: 'password') - ]) { + withCredentials([string( + credentialsId: "slave-pass-${env.NODE_NAME}", + variable: 'password' + )]) { sh "plutil -replace CFBundleShortVersionString -string ${version} ios/StatusIm/Info.plist" sh "plutil -replace CFBundleVersion -string ${build_no} ios/StatusIm/Info.plist" env.RCT_NO_LAUNCH_PACKAGER = true - sh 'xcodebuild -workspace ios/StatusIm.xcworkspace -scheme StatusIm -configuration release -archivePath status clean archive' sh "security unlock-keychain -p ${password} login.keychain" + sh 'xcodebuild -workspace ios/StatusIm.xcworkspace -scheme StatusIm -configuration release -archivePath status clean archive' sh 'xcodebuild -exportArchive -exportPath status_appstore -archivePath status.xcarchive -exportOptionsPlist ios/archive-release.plist' sh 'xcodebuild -exportArchive -exportPath status -archivePath status.xcarchive -exportOptionsPlist ios/archive-develop.plist' } diff --git a/ci/Jenkinsfile.upload_release_ios b/ci/Jenkinsfile.upload_release_ios index 904ba3c52c..eed08e2f3b 100644 --- a/ci/Jenkinsfile.upload_release_ios +++ b/ci/Jenkinsfile.upload_release_ios @@ -74,12 +74,15 @@ timeout(90) { } stage('Build (iOS)') { - withCredentials([string(credentialsId: 'jenkins_pass', variable: 'password')]) { + withCredentials([string( + credentialsId: "slave-pass-${env.NODE_NAME}", + variable: 'password' + )]) { sh "plutil -replace CFBundleShortVersionString -string ${version} ios/StatusIm/Info.plist" sh "plutil -replace CFBundleVersion -string ${build_no} ios/StatusIm/Info.plist" env.RCT_NO_LAUNCH_PACKAGER = true - sh 'xcodebuild -workspace ios/StatusIm.xcworkspace -scheme StatusIm -configuration release -archivePath status clean archive' sh "security unlock-keychain -p ${password} login.keychain" + sh 'xcodebuild -workspace ios/StatusIm.xcworkspace -scheme StatusIm -configuration release -archivePath status clean archive' sh 'xcodebuild -exportArchive -exportPath status_appstore -archivePath status.xcarchive -exportOptionsPlist ios/archive-release.plist' } }