diff --git a/Jenkinsfile b/Jenkinsfile index 46fc6a5..9f24257 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -243,7 +243,6 @@ ] } -// From alpha to beta, only for deploy branches lazyStage { name = 'alpha' onlyif = ( deployBranches.contains(lazyConfig['branch']) ) @@ -256,13 +255,16 @@ if ( !lazyConfig.env.DRYRUN ) { withCredentials([file(credentialsId: env.GOOGLE_API_CID, variable: 'GOOGLE_API_FILE')]) { sh('cp $GOOGLE_API_FILE ~/GoogleAPICredentials.json') - fastLane('android', 'alpha') + def currentVersion = androidVersion() + withEnv(["VERSION=${currentVersion.string}-${currentVersion.number}"],) { + fastLane('android', 'alpha') + } } } }, args: "-v /opt/android:/opt/android" - + " -e ANDROID_HOME=${env.ANDROID_HOME}" - + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", + + " -e ANDROID_HOME=${env.ANDROID_HOME}" + + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", in: [ 'centos7' ], on: 'android', ] @@ -288,8 +290,8 @@ } }, args: "-v /opt/android:/opt/android" - + " -e ANDROID_HOME=${env.ANDROID_HOME}" - + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", + + " -e ANDROID_HOME=${env.ANDROID_HOME}" + + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", in: [ 'centos7' ], on: 'android', ]