Configuring GitVersion for "simple" trunk based development

[Crown0815]

I would like to use GitVersion for a rather simple versioning scheme based on trunk based development with branch for release strategy.
The goal is to have trunk and release branches produce consistent -rc.X prereleases until a commit is explicitly tagged with a version, where all versions on trunk would always be major.minor.0 and on release branches major.minor.patch (where patch could also be zero.

An example could look like this:

---
config:
  theme: default
  gitGraph:
    mainBranchName: 'trunk'
---
gitGraph:
    commit id: "0.1.0-rc.0"
    commit id: "0.1.0-rc.1"
    branch release/1.0.0
    checkout trunk
    commit id: "1.1.0-rc.1"
    checkout release/1.0.0
    commit id: "1.0.0-rc.1"
    commit id: "1.0.0-rc.2 " tag: "v1.0.0"
    commit id: "1.0.1-rc.1"
    commit id: "1.0.1-rc.2" tag: "v1.0.1"
    checkout trunk
    commit id: "1.1.0-rc.2" tag: "v1.1.0"
    branch release/1.1.0
    checkout trunk
    commit id: "1.2.0-rc.1"
    checkout release/1.1.0
    commit id: "1.1.1-rc.1"
    commit id: "1.1.1-rc.2" tag: "1.1.1"
    commit id: "1.1.2-rc.1"
    commit id: "1.1.2-rc.2" tag: "1.1.2"
    checkout trunk
    commit id: "1.2.0-rc.2"
    branch release/1.2.0
    checkout trunk
    commit id: "1.3.0-rc.1"
    checkout release/1.2.0
    commit id: "1.2.0-rc.3"
    commit id: "1.2.0-rc.4" tag: "1.2.0"
    commit id: "1.2.1-rc.1"
    commit id: "1.2.1-rc.2" tag: "1.2.1"
    checkout trunk
    commit id: "1.3.0-rc.2" tag: "1.3.0"
    commit id: "1.4.0-rc.1"

Loading

Trunk

There are 3 different sources for the version on trunk:

• Tag on branch (Minor bump with base version from the tag)
• Release branch name (Minor bump with base version from release branch name)*
• Tag on no branch with shared ancestor (Minor bump with base version from the tag)

*) this is an optional requirement that would allow the deletion of outdated release branches.

Release

There are 2 different sources for the version on release:

• Branch name (no bump with base version from branch name)
• Tag (Patch bump with base version from the tag)

Always the highest determined version from all sources dominates.

The release tags (non-prerelease) would be created manually and would not have to be calculated by GitVersion.

Is it possible to configure GitVersion to get such a behavior?
(I already saw #3387, but it does not work reliably)

[HHobeck]

Your workflow has nothing to do with the TrunkBased/preview1 workflow in GitVersion. You should try the GitFlow/v1 workflow and change the regular expression of the develop branch configuration to trunk.

workflow: GitFlow/v1
branches:
  develop:
    regex: ^trunk$
    label: rc
    increment: Patch
  release:
    label: rc

See: https://gitversion.net/docs/reference/configuration

[Crown0815]

I already tried that, but I was not able to get the configuration to a point where results would be consistent.

[HHobeck]

You could also use the main (name as trunk) and support (name as release) branch configuration. It is not necessary to put the version into the branch name. I have no clue. what do you mean with it would be not consistent?

See: https://gitversion.net/docs/learn/branching-strategies/gitflow/examples#support-branches