diff --git a/Jenkinsfile.nightly_fastlane b/Jenkinsfile.nightly_fastlane index cfabb7f000..6eecdbfadc 100644 --- a/Jenkinsfile.nightly_fastlane +++ b/Jenkinsfile.nightly_fastlane @@ -22,7 +22,7 @@ timeout(90) { def apkUrl = '' def ipaUrl = '' def testPassed = true - def latest_tag; + def version; load "$HOME/env.groovy" @@ -33,11 +33,9 @@ timeout(90) { checkout scm + version = readFile "${env.WORKSPACE}/VERSION" + sh 'git fetch --tags' - latest_tag = sh( - returnStdout: true, - script: 'git describe --tags `git rev-list --tags=\'[0-9]*.[0-9]*.[0-9]*\' --max-count=1`' - ).trim() sh 'rm -rf node_modules' sh 'cp .env.nightly .env' sh 'lein deps' @@ -62,7 +60,7 @@ timeout(90) { stage('Build (iOS)') { withCredentials([string(credentialsId: 'jenkins_pass', variable: 'password')]) { def build_no = sh(returnStdout: true, script: './scripts/build_no.sh --tag').trim() - sh ('plutil -replace CFBundleShortVersionString -string ' + latest_tag + ' ios/StatusIm/Info.plist') + sh ('plutil -replace CFBundleShortVersionString -string ' + version + ' ios/StatusIm/Info.plist') sh ('plutil -replace CFBundleVersion -string ' + build_no + ' ios/StatusIm/Info.plist') sh 'export RCT_NO_LAUNCH_PACKAGER=true && xcodebuild -workspace ios/StatusIm.xcworkspace -scheme StatusIm -configuration release -archivePath status clean archive' sh ('security unlock-keychain -p ' + password + ' login.keychain') diff --git a/Jenkinsfile.release b/Jenkinsfile.release index 579a044ca6..953513f555 100644 --- a/Jenkinsfile.release +++ b/Jenkinsfile.release @@ -38,7 +38,6 @@ timeout(90) { checkout scm version = readFile "${env.WORKSPACE}/VERSION" - sh 'echo "' + version + '" > .version' sh 'git fetch --tags' diff --git a/Jenkinsfile.upload_release b/Jenkinsfile.upload_release index e76107afd2..a97dec9830 100644 --- a/Jenkinsfile.upload_release +++ b/Jenkinsfile.upload_release @@ -39,8 +39,6 @@ timeout(90) { version = readFile "${env.WORKSPACE}/VERSION" - sh 'echo "' + version + '" > .version' - sh 'git fetch --tags' sh 'rm -rf node_modules'