How to get version on main (release) branch to increment without tagging commits?

[will-scc]

This should be really simple but I cannot get it working on even a very basic example repo.

We're us a flavour of GitFlow, so the branches look like this:

• main
• release-candidate
• develop

Development is done via feature branches off develop which are merged back into develop. When ready, a new release candidate is created. This is merging develop into release-candidate branch. The release-candidate automatically builds and deploys builds on any PR to the testing team. Any bug fixes are done via bug branches (bug/12345/fix-a-bug) merged back into release-candidate,

What I want to happen is the following:

• On any commit/PR into release-candidate, release-candidate gets built with a version like 0.1.0-rc.4 which will increment every commit (e.g. 0.1.0-rc.5, 0.1.0-rc.6 etc)
• When release-candidate gets merged into main, main should update the Minor version, e.g. 0.1.0-rc.6on release-candidate merges intomainand thenmainbuilds with version0.2.0`
• Any hotfixes into main will advance patch (e.g. 0.2.0 becomes 0.2.1

I don't want to have to tag commits to advance the version.

This is the current config that seems to work correctly for everything apart from advancing the version as desired on main:

update-build-number: true
assembly-file-versioning-scheme: MajorMinorPatch
mode: ContinuousDeployment
branches:
  main:
    label: ''
    regex: ^main$
    increment: Minor
    is-release-branch: true
    source-branches:
    - release-candidate
    - hotfix
  develop:
    label: alpha
    regex: ^develop$
    increment: Minor
  release-candidate:
    label: 'rc'
    regex: ^release-candidate$
    increment: Patch
    source-branches:
    - develop
    - bugfix 
  bugfix:
    label: ''
    regex: ^(bugfix|bug)\/.*
    increment: Patch
  hotfix:
    label: ''
    regex: ^hotfix[/-]
    increment: Patch

Any help would be massively appreciated.

[HHobeck]

I’d suggest starting with the following configuration:

workflow: TrunkBased/preview1

with branch:

• main
• feature
• hotfix

This setup follows a trunk-based development approach without the need of creating tags.

Link[1]: TrunkBased/preview1.yml