Environment:
"./gradlew release -i" is not merging changes from "main" branch to "release". It always shows the following with no output []:
Running [git, merge, --no-ff, --no-commit, main] produced output: []
But if I do the "Running..." steps manually, I see the following:
$ git checkout release
$ git merge --no-ff --no-commit main
The git merge
command outputs "Automatic merge went well; stopped before committing as requested"
Below is the git repo that is having problems:
https://github.com/rubensgomes/helloworld-ms
Am I missing any configuration?
From a very quick look at https://github.com/researchgate/gradle-release/blob/main/src/main/groovy/net/researchgate/release/tasks/PreTagCommit.groovy I'd say it is a bug in the release plugin which only does the pre-tag commit if snapshot version is used, version was modified, or properties file was created, and in your case neither of this is true, but as you use a pushReleaseVersionBranch
, you would still need a commit that finalizes the merge from main
.
So as a work-around you could either:
...-SNAPSHOT
version,tasks.preTagCommit {
doFirst {
extension.attributes["versionModified"] = true
}
}
until this is fixed in the plugin after you reported the problem.