GitHub Flow with Release Branches

[MrHinsh]

Im trying to configure GitVersion for "Release Flow"... Thsi is models after the Azure DevOps teams branching strategy and

• main/master = this is where all work is done, and like Git Flow any topic branches are merged.
• Release/v0.3.0 = This is created as a release and is shipped to production.

Working on main (v1.0.0-preview.12) and then creating relase/v1.0.0 should trigger main to then version as v1.0.1-preview.1

I can currently get release to work, but I cant get main to increment once the release has been created...

Current GitVersion.yaml

assembly-versioning-scheme: MajorMinorPatchTag
mode: ContinuousDelivery
next-version: 0.2.0
branches: 
  main:
      mode: ContinuousDelivery
      tag: 'preview'
      increment: Patch
      is-mainline: true
      prevent-increment-of-merged-branch-version: false
      tracks-release-branches: true
      regex: ^master$|^main$
  release:
    mode: ContinuousDelivery
    tag: ""
    increment: Patch
    track-merge-target: false
    regex: ^release(s)?[\/-]
    source-branches:
    - master
    - main
    is-release-branch: true
    is-mainline: false
ignore:
  sha: []
merge-message-formats: {}

How can I configure main to increment to release+patch when the release branch is created?

[HHobeck]

Maybe it is quite naive. But why not just using the GitFlow workflow and rename the develop branch to main?

branches:
  develop:
    regex: ^master$|^main$
  main:
    regex: ^$

[MrHinsh]

It's an interested idea.

With my limited testing what I have above is doing what I want. I've just not hit the edge cases yet.

[MrHinsh]

@HHobeck as I see you are the expert I'm a little stumped...

assembly-versioning-scheme: MajorMinorPatchTag
mode: ContinuousDelivery
continuous-delivery-fallback-tag: ''
next-version: 0.2.0
branches: 
  main:
      mode: ContinuousDelivery
      tag: 'Preview'
      increment: Patch
      is-mainline: true
      prevent-increment-of-merged-branch-version: false
      tracks-release-branches: true
      regex: ^master$|^main$
  release:
    mode: ContinuousDelivery
    tag: ""
    increment: Patch
    track-merge-target: false
    regex: ^releases?[/-]
    source-branches:
    - master
    - main
    is-release-branch: true
    is-mainline: false
ignore:
  sha: []
merge-message-formats: {}

Why would a branch named release/v1.0.2 be flagged as preview?

I was expecting it to not have a tag at all!

[MrHinsh]

No, I'm defo not asking any questions about Git Flow.

I'm asking why my release branch above gets a "preview" tag.

[HHobeck]

All versions are pre-release version until you tag it with a dedicated version number. In the up-coming version 6.x you can use ContinuousDeployment mode to suppress the pre-release number (keep in mind that the mode has no influence on version caluclation itself).

Edit: The meaning of ContinuousDeployment has been changed in version 6.x

[MrHinsh]

OK, so I would have to use a Tag instead of a Branch, and trigger a build/release on Tag?

[MrHinsh]

@HHobeck do you have an example of the 6x documentation? I'd like to give it a try...

[HHobeck]

@HHobeck do you have an example of the 6x documentation? I'd like to give it a try...

workflow: GitFlow/v1
mode: ContinuousDeployment