diff --git a/Jenkinsfile b/Jenkinsfile index 821aa1a..798ad3f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -71,7 +71,7 @@ def gitMerge(fromBranch, toBranch, msg) { sh(""" git checkout ${toBranch} -git merge ${toBranch} -m '${msg}' +git merge ${fromBranch} -m '${msg}' """) } @@ -227,7 +227,7 @@ gitMerge( "${releaseFrom['remote']}/${env.BRANCH_NAME}", "${releaseFrom['remote']}/${releaseFrom['branch']}", - "Merge changes from ${currentVersion['versionName']}-${currentVersion['versionCode']} back into ${releaseFrom['branch']}" + "Merge changes from ${currentVersion['name']}-${currentVersion['code']} back into ${releaseFrom['branch']}" ) gitPush(releaseFrom['remote'], releaseFrom['branch']) }) @@ -258,7 +258,7 @@ gitMerge( "${releaseFrom['remote']}/${env.BRANCH_NAME}", "${releaseTo['remote']}/${releaseTo['branch']}", - "Merge changes from ${currentVersion['versionName']}-${currentVersion['versionCode']} into ${releaseTo['branch']}" + "Merge changes from ${currentVersion['name']}-${currentVersion['code']} into ${releaseTo['branch']}" ) gitPush(releaseTo['remote'], releaseTo['branch']) gitTag("${currentVersion.name}", releaseTo['remote'])