diff --git a/Jenkinsfile b/Jenkinsfile index c9b38f2..b0adeb7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -221,7 +221,7 @@ if ( env.DRYRUN != 'true' ) fastlane('android', 'alpha') sh(""" git checkout ${releaseFrom['remote']}/${releaseFrom['branch']} -git merge ${env.BRANCH_NAME} -m 'Merge changes from ${versionName}-${versionCode} back into ${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) gitPush(releaseFrom['remote'], releaseFrom['branch']) @@ -251,7 +251,7 @@ def currentVersion = [ name: getVersion('versionName') as String, code: getVersion('versionCode') as Integer ] sh(""" git checkout ${releaseTo['remote']}/${releaseTo['branch']} -git merge ${env.BRANCH_NAME} -m 'Merge changes from ${versionName}-${versionCode} into ${releaseTo['branch']}' +git merge releaseFrom['remote']/${env.BRANCH_NAME} -m 'Merge changes from ${currentVersion['versionName']}-${currentVersion['versionCode']} into ${releaseTo['branch']}' """) gitPush(releaseTo['remote'], releaseTo['branch']) gitTag("${currentVersion.name}", releaseTo['remote'])