search

researchgate / gradle-release

gradle-release is a plugin for providing a Maven-like release process for projects using Gradle
MIT License
868 stars 220 forks source link

Task checkoutMergeToReleaseBranch FAILED after pull request has been merged #359

Closed rolfhub closed 2 years ago

rolfhub commented 2 years ago

Plugin version 2.8.1 Using the pushReleaseVersionBranch feature.

After a pull-request was merged (with merge-commit) to a release branch the checkoutMergeToReleaseBranch task fails:

13:29:57.787 |  > Task :GLF1909:createScmAdapter
13:29:57.787 |  > Task :GLF1909:initScmAdapter
13:29:58.037 |  > Task :GLF1909:checkCommitNeeded
13:29:58.950 |  > Task :GLF1909:checkUpdateNeeded
13:30:02.179 |  
13:30:02.179 |  > Task :GLF1909:checkoutMergeToReleaseBranch FAILED
13:30:02.179 |  Running [git, merge, --no-ff, --no-commit, release_27] produced an error: []
13:30:02.179 |  
13:30:02.179 |  > Task :release FAILED
13:30:02.180 |  Release process failed, reverting back any changes made by Release Plugin.
13:30:02.180 |  Running [git, checkout, gradle.properties] produced an error: [error: pathspec 'gradle.properties' did not match any file(s) known to git]
13:30:02.180 |  
13:30:02.180 |  FAILURE: Build failed with an exception.
13:30:02.180 |  
13:30:02.180 |  * What went wrong:
13:30:02.180 |  Execution failed for task ':GLF1909:checkoutMergeToReleaseBranch'.
13:30:02.180 |  > Failed to run [git merge --no-ff --no-commit release_27] - [Auto-merging projects/unigateway/gradle.properties
13:30:02.180 |    CONFLICT (content): Merge conflict in projects/unigateway/gradle.properties
...
13:30:02.181 |    Automatic merge failed; fix conflicts and then commit the result.
13:30:02.181 |    ][]
rolfhub commented 2 years ago

We set a wrong value in the pushReleaseVersionBranch parameter. With the correct branch name set the plugin works as expected. Sorry to bother.