Feature/merge message releases #3966
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
asbjornu
requested changes
Mar 28, 2024
| @@ -96,13 +96,10 @@ private ReferenceName GetMergedBranchName(string mergedBranch) | |||
| mergeCommit.NotNull(); | |||
| 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.
| @@ -65,7 +66,7 @@ public void TakesVersionFromMergeOfReleaseBranch(string message, bool isMergeCom | |||
| AssertMergeMessage(message + "\n ", expectedVersion, parents); | |||
| } | |||
|
|
|||
| [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. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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: