How to configure GitVersion for automatic main version increase after "unversioned" hotfix merge?

[user1584]

I try to configure GitVersion to follow the GitFlow strategy with as little human versioning as possible. According to the GitVersion documentation, the hotfix branches should be named with the desired version for the main branch after merge (e.g. if main is on "1.2.0", the hotfix branch should be named "hotfix/12.1"). However, I was wondering if it is somehow possible to configure GitVersion such that all hotfix merges increase the patch part of the main branch version.
What I am trying to achieve is that a name such as "hotfix/put-out-the-fire" will increase the main version from "1.2.0" to "1.2.1".
Is this possible with 5.x or 6.x?

[HHobeck]

At this moment it is only supported in Mainline mode (in 5.x and 6-beta.3) with dedicated merge commit messages (in azure devops the source branch is missing and not working out of the box). In the 6-beta.4 version the Mainline mode will be properly replaced with a TrunkBased version strategy.

GitVersion/src/GitVersion.Core.Tests/IntegrationTests/MainlineDevelopmentMode.cs

Line 415 in 0ff62cc

public void MergingFeatureBranchThatIncrementsMinorNumberIncrementsMinorVersionOfMain()

Please see also:

• Mainline Not Incrementing SemVer when merging to main with AzureDevops #3800
• Replace the version mode Mainline in 6.x #3601
• [Improvement] Increment version as per source branch  #3689

Happy Branching!

[HHobeck]

Yes of course. We have already an improvement request. Please see #3689.

[user1584]

As far as I understand #3689, it's focus is on correct versioning of the development branch, whereas I am more concerned with the main branch. Is the target branch irrelevant? If yes, this improvement would be exacatly what I need.

[HHobeck]

Everything in GitVersion related to the behavior of how the versions are incremented are configurable. The hole feature is not existing and needs to be implement first (If someone will be found doing this). Afterwards we can think about how to use it in which workflows and on which branches. Any time you can tailor the workflow like you wish. Why not just document your thoughts in #3689 that you need this on main branch as well? I think a new issue is not needed.

Edit: Please provide integration tests for your scenario if you not mind.

[user1584]

OK, thanks! I have no experience with C# - therefore I am not sure how to write a test and how to test the test. Can you point me to some examples (specific to GitVersion)?

[HHobeck]

No problem. You will find the integration tests in the following folder: https://github.com/GitTools/GitVersion/tree/main/src/GitVersion.Core.Tests/IntegrationTests