diff --git a/Jenkinsfile b/Jenkinsfile index 57269aa..9341130 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -63,11 +63,11 @@ lazyConfig( name: 'dummy-and', env: [ - RELEASE: true, - JAVA_HOME: '/usr/java/latest', - ANDROID_HOME: '/opt/android/sdk', - GRADLE_USER_HOME: '/opt/android/gradle', - ], + RELEASE: true, + JAVA_HOME: '/usr/java/latest', + ANDROID_HOME: '/opt/android/sdk', + GRADLE_USER_HOME: '/opt/android/gradle', + ], noIndex: '(.+_.+|production)', // Avoid automatic indexing for release and private branches ) @@ -76,7 +76,7 @@ name = 'validate' onlyif = (! deployBranches.contains(lazyConfig['branch']) ) tasks = [ - pre: { + pre: { def currentVersion = androidVersion() currentBuild.displayName = "#${env.BUILD_NUMBER} ${currentVersion.string}-${currentVersion.number}" // Try to see if we can still merge the deploy branches @@ -89,31 +89,31 @@ run: { fastLane('android', 'test', '', 'rh-ruby24') }, - args: "-v /opt/android:/opt/android" - + " -e JAVA_HOME=${env.JAVA_HOME}" - + " -e ANDROID_HOME=${env.ANDROID_HOME}" - + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", - in: [ 'centos7' ], - on: 'android', + args: "-v /opt/android:/opt/android" + + " -e JAVA_HOME=${env.JAVA_HOME}" + + " -e ANDROID_HOME=${env.ANDROID_HOME}" + + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", + in: [ 'centos7' ], + on: 'android', ] } lazyStage { name = 'package' tasks = [ - pre: { + pre: { def currentVersion = androidVersion() currentBuild.displayName = "#${env.BUILD_NUMBER} ${currentVersion.string}-${currentVersion.number}" }, run: { fastLane('android', 'build', '', 'rh-ruby24') }, - args: "-v /opt/android:/opt/android" - + " -v /opt/certificates:/opt/certificates" - + " -e JAVA_HOME=${env.JAVA_HOME}" - + " -e ANDROID_HOME=${env.ANDROID_HOME}" - + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", - in: [ 'centos7' ], + args: "-v /opt/android:/opt/android" + + " -v /opt/certificates:/opt/certificates" + + " -e JAVA_HOME=${env.JAVA_HOME}" + + " -e ANDROID_HOME=${env.ANDROID_HOME}" + + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", + in: [ 'centos7' ], on: 'android', post: { archiveArtifacts(artifacts: "${buildDir}/**", allowEmptyArchive: false) @@ -165,7 +165,7 @@ gitPush(remote, workingBranch) }) }, - in: [ 'centos7' ], + in: [ 'centos7' ], on: 'android', ] } @@ -184,11 +184,11 @@ fastLane('android', 'alpha', '', 'rh-ruby24') } }, - args: "-v /opt/android:/opt/android" - + " -e JAVA_HOME=${env.JAVA_HOME}" - + " -e ANDROID_HOME=${env.ANDROID_HOME}" - + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", - in: [ 'centos7' ], + args: "-v /opt/android:/opt/android" + + " -e JAVA_HOME=${env.JAVA_HOME}" + + " -e ANDROID_HOME=${env.ANDROID_HOME}" + + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", + in: [ 'centos7' ], on: 'android', ] } @@ -206,11 +206,11 @@ fastLane('android', 'beta', '', 'rh-ruby24') } }, - args: "-v /opt/android:/opt/android" - + " -e JAVA_HOME=${env.JAVA_HOME}" - + " -e ANDROID_HOME=${env.ANDROID_HOME}" - + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", - in: [ 'centos7' ], + args: "-v /opt/android:/opt/android" + + " -e JAVA_HOME=${env.JAVA_HOME}" + + " -e ANDROID_HOME=${env.ANDROID_HOME}" + + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", + in: [ 'centos7' ], on: 'android', ] } @@ -228,11 +228,11 @@ fastLane('android', 'beta_crash', "fl_branch:\"${lazyConfig['branch']}\"", 'rh-ruby24') } }, - args: "-v /opt/android:/opt/android" - + " -e JAVA_HOME=${env.JAVA_HOME}" - + " -e ANDROID_HOME=${env.ANDROID_HOME}" - + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", - in: [ 'centos7' ], + args: "-v /opt/android:/opt/android" + + " -e JAVA_HOME=${env.JAVA_HOME}" + + " -e ANDROID_HOME=${env.ANDROID_HOME}" + + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", + in: [ 'centos7' ], on: 'android', ] } @@ -250,11 +250,11 @@ fastLane('android', 'production', '', 'rh-ruby24') } }, - args: "-v /opt/android:/opt/android" - + " -e JAVA_HOME=${env.JAVA_HOME}" - + " -e ANDROID_HOME=${env.ANDROID_HOME}" - + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", - in: [ 'centos7' ], + args: "-v /opt/android:/opt/android" + + " -e JAVA_HOME=${env.JAVA_HOME}" + + " -e ANDROID_HOME=${env.ANDROID_HOME}" + + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}", + in: [ 'centos7' ], on: 'android', ] }