diff --git a/Jenkinsfile b/Jenkinsfile index 3434643..0b7b83a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -220,8 +220,10 @@ sh("ls -lA app/build/outputs/apk") }, run: { + def currentVersion = [ name: getVersion('versionName') as String, code: getVersion('versionCode') as Integer ] + echo("currentVersion = ${currentVersion.toString()}") + if ( env.DRYRUN != 'true' ) fastlane('android', 'alpha') withGitPassword('bot-ci-dgm', { - if ( env.DRYRUN != 'true' ) fastlane('android', 'alpha') gitMerge( "${releaseFrom['remote']}/${env.BRANCH_NAME}", "${releaseFrom['remote']}/${releaseFrom['branch']}", @@ -250,12 +252,13 @@ tasks = [ run: { if ( env.DRYRUN != 'true' ) fastlane('android', 'production') + def currentVersion = [ name: getVersion('versionName') as String, code: getVersion('versionCode') as Integer ] + echo("currentVersion = ${currentVersion.toString()}") withGitPassword('bot-ci-dgm', { - def currentVersion = [ name: getVersion('versionName') as String, code: getVersion('versionCode') as Integer ] gitMerge( "${releaseFrom['remote']}/${env.BRANCH_NAME}", "${releaseTo['remote']}/${releaseTo['branch']}", - "Merge changes from ${currentVersion['versionName']}-${currentVersion['versionCode']} back into ${releaseTo['branch']}" + "Merge changes from ${currentVersion['versionName']}-${currentVersion['versionCode']} into ${releaseTo['branch']}" ) gitPush(releaseTo['remote'], releaseTo['branch']) gitTag("${currentVersion.name}", releaseTo['remote'])