TrunkBased/preview1, Azure Pipelines & Main branch increment on PR

[maondrej]

Hello All,

We use simple TrunkBased/preview1 workflow with the default configuration and the following branches:

• main (Increment None)
• feature (Increment Minor)
• hotfix (Increment Patch)
• pull-request (Increment Inherit)

We develop on main and merging everything based on PR. If I merge to main from a feature or hotfix on the local PC using native git commands, version increments on main works as expected (etc. 1.1.0 or 1.0.1 based on branch being merged). However, if I merge using PR (no-ff) in Azure pipelines then version doesn't inherit from the source branch.

Similar topics already posted #3800 or #1579

Gitversion.xml = default config based on docu > https://gitversion.net/docs/reference/configuration
Gitversion = latest 6.5.1
Build server: Azure DevOps Pipelines

workflow:TrunkBased/preview1
assembly-versioning-scheme: MajorMinorPatch
assembly-file-versioning-scheme: MajorMinorPatch
tag-prefix: '[vV]?'
version-in-branch-pattern: (?[vV]?\d+(.\d+)?(.\d+)?).*
major-version-bump-message: +semver:\s?(breaking|major)
minor-version-bump-message: +semver:\s?(feature|minor)
patch-version-bump-message: +semver:\s?(fix|patch)
no-bump-message: +semver:\s?(none|skip)
tag-pre-release-weight: 60000
commit-date-format: yyyy-MM-dd
merge-message-formats: {}
update-build-number: true
semantic-version-format: Strict
strategies:

• ConfiguredNextVersion
• Mainline
  branches:
  main:
  mode: ContinuousDeployment
  label: ''
  increment: None
  prevent-increment:
  of-merged-branch: true
  track-merge-target: false
  track-merge-message: true
  regex: ^master$|^main$
  source-branches: []
  is-source-branch-for: []
  tracks-release-branches: false
  is-release-branch: false
  is-main-branch: true
  pre-release-weight: 55000
  feature:
  mode: ContinuousDelivery
  label: '{BranchName}'
  increment: Minor
  prevent-increment:
  when-current-commit-tagged: false
  track-merge-message: true
  regex: ^feat?/-
  source-branches:
  • main
    is-source-branch-for: []
    is-main-branch: false
    pre-release-weight: 30000
    hotfix:
    mode: ContinuousDelivery
    label: '{BranchName}'
    increment: Patch
    prevent-increment:
    when-current-commit-tagged: false
    regex: ^fix?/-
    source-branches:
  • main
    is-source-branch-for: []
    is-release-branch: true
    is-main-branch: false
    pre-release-weight: 30000
    pull-request:
    mode: ContinuousDelivery
    label: PullRequest{Number}
    increment: Inherit
    prevent-increment:
    of-merged-branch: true
    when-current-commit-tagged: false
    track-merge-message: true
    regex: ^(pull-requests|pull|pr)/-
    source-branches:
  • main
  • feature
  • hotfix
    is-source-branch-for: []
    pre-release-weight: 30000
    unknown:
    increment: Patch
    prevent-increment:
    when-current-commit-tagged: false
    regex: (?.+)
    source-branches:
  • main
    is-source-branch-for: []
    pre-release-weight: 30000
    ignore:
    sha: []
    paths: []
    mode: ContinuousDelivery
    label: '{BranchName}'
    increment: Inherit
    prevent-increment:
    of-merged-branch: false
    when-branch-merged: false
    when-current-commit-tagged: true
    track-merge-target: false
    track-merge-message: true
    commit-message-incrementing: Enabled
    regex: ''
    source-branches: []
    is-source-branch-for: []
    tracks-release-branches: false
    is-release-branch: false
    is-main-branch: false

[HHobeck]

Hello All,

We use simple TrunkBased/preview1 workflow with the default configuration and the following branches:

• main (Increment None)
• feature (Increment Minor)
• hotfix (Increment Patch)
• pull-request (Increment Inherit)

We develop on main and merging everything based on PR. If I merge to main from a feature or hotfix on the local PC using native git commands, version increments on main works as expected (etc. 1.1.0 or 1.0.1 based on branch being merged). However, if I merge using PR (no-ff) in Azure pipelines then version doesn't inherit from the source branch.

Similar topics already posted #3800 or #1579

Hi there.

What is the question?

[maondrej]

@HHobeck: The question is why version increments works as expected locally but not in Azure DevOps while performing PR (no-ff). Is it just a config related issue or something that is coming from ADO? Maybe someone from here has an experience with it and can point to a solution.

[HHobeck]

Yes, it has to do with how the PR message in AzureDevops is created. Please see the following discussion:

• Mainline Not Incrementing SemVer when merging to main with AzureDevops #3800

See also discussion in the Developer Community:

• Customizable templates for the default merge commit message
• Change default title for pull request commits to not include PR id