diff --git a/Jenkinsfile b/Jenkinsfile index b0adeb7..8b1adac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -192,7 +192,7 @@ echo("Git logs since last tag:\n" + gitLog()) sh("git checkout -b release-${env.LAZY_INPUT}") gitUpdateChangelogs(currentVersion.code) - gitUpdateVersion(env.LAZY_INPUT, currentVersion.code) + gitUpdateVersion(env.LAZY_INPUT, currentVersion.code + 1) def nextVersion = [ name: getVersion('versionName') as String, code: getVersion('versionCode') as Integer ] echo("nextVersion = ${nextVersion.toString()}" ) gitPush(releaseFrom['remote'], "release-${env.LAZY_INPUT}") @@ -214,16 +214,15 @@ }, run: { withGitPassword('bot-ci-dgm', { - def dryRun = ( env.DRYRUN == 'true' ) ? '--dry-run' : '' - def currentVersion = [ name: getVersion('versionName') as String, code: getVersion('versionCode') as Integer ] - def nextVersion = [ name: currentVersion.name, code: currentVersion.code + 1] - echo("currentVersion = ${currentVersion.toString()} / nextVersion = ${nextVersion.toString()}") +// def currentVersion = [ name: getVersion('versionName') as String, code: getVersion('versionCode') as Integer ] +// def nextVersion = [ name: currentVersion.name, code: currentVersion.code + 1] +// echo("currentVersion = ${currentVersion.toString()} / nextVersion = ${nextVersion.toString()}") if ( env.DRYRUN != 'true' ) fastlane('android', 'alpha') sh(""" git checkout ${releaseFrom['remote']}/${releaseFrom['branch']} git merge releaseFrom['remote']/${env.BRANCH_NAME} -m 'Merge changes from ${currentVersion['versionName']}-${currentVersion['versionCode']} back into ${releaseFrom['branch']}' """) - gitUpdateVersion(nextVersion.name, nextVersion.code) +// gitUpdateVersion(nextVersion.name, nextVersion.code) gitPush(releaseFrom['remote'], releaseFrom['branch']) }) },