Feature/merge message releases #3966
Conversation
asbjornu
left a comment
asbjornu
left a comment
There was a problem hiding this comment.
I think this looks mostly fine!
| configuration.NotNull(); | ||
|
|
||
| mergeMessage = null; | ||
| mergeMessage = new(mergeCommit.Message, configuration); |
There was a problem hiding this comment.
mergeMessage should not be set if the return value equals false.
There was a problem hiding this comment.
Understood, I've changed it.
| } | ||
|
|
||
| [TestCase("Merge branch 'hotfix-0.1.5'", false)] | ||
| // [TestCase("Merge branch 'hotfix-0.1.5'", false)] this is somehow configured as a release branch |
There was a problem hiding this comment.
Can you please elaborate on how hotfix-0.1.5 is configured as a release branch? Is is-release-branch set to true?
There was a problem hiding this comment.
Yes, the is-release-branch is set to true.
Here's an excerpt of the generated configuration:
hotfix:
mode: ManualDeployment
label: beta
increment: Inherit
prevent-increment:
when-current-commit-tagged: false
regex: ^hotfix(es)?[/-](?<BranchName>.+)
source-branches:
- release
- main
- support
- hotfix
is-source-branch-for: []
is-release-branch: true
pre-release-weight: 30000I've changed the failing test to set the hotfix branch as is-release-branch: false, however there might be a different approach that is unknown to me.
|
Closing this PR in favour to #3984 with all current changes from master. |
2 participants
Extended the
TryParseoperation to check whether the commit source branch is a release branch in order to support increment of merges from release into main branch when a squash merge has been applied.Motivation and Context
Discussion
How Has This Been Tested?
MergeMessageBaseVersionStrategyTests.cswith a test using thefalseflag onIsMergeCommit❗ I had to comment one test, as the
hotfix-0.1.5branch was somehow configured as a release branch and thus, the version was taken into respect. Would appreciate some feedback here!Checklist: