[Feature] Same version computed on different branches

[HHobeck]

[Feature] Same version computed on different branches:

• [Feature] Same version computed on different branches #3453

Close #3453

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Checklist:

• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have added tests to cover my changes.
• All new and existing tests passed.

[HHobeck]

Hi @asbjornu. I'm not sure if you are agree with the new branch related property with name take-incremented-version. Please take a look and give me feedback. (#3455 (comment))

Thank's

[asbjornu]

Do I understand this issue correctly when it's about whether we want to consider the git tag of the current commit or not? If so, perhaps ignore-tag: False would be more intuitive?

[HHobeck]

Do I understand this issue correctly when it's about whether we want to consider the git tag of the current commit or not? If so, perhaps ignore-tag: False would be more intuitive?

At the end the criteria you are mentioned is correct. But you need to think about the semantic meaning. We have one or more strategies who are determining the existing base versions with an indication should the version be incremented yes or no. We are calculating based on this the next version and take the one which is highest. The result is we have exactly one base version and one incremented version (which might be equal). Now this feature comes in place where we want for some branches not to use the incremented version but the base version.

I can think of the following use cases:

• Take always the base version and not the incremented version,
• Take the base version when the current commit was released otherwise the incremented version,
• Take always the incremented version and not the base version

Your proposed property with name ignore-tag does not reflect this semantic meaning if you ask me. It's also not about ignoring tags because the current tag will be considered and used to calculate the incremented version. If someone uses the ignore-tag property he could expect that all tags are ignored on the branch and not considered for the version calculation (like you would specify to ignore commits).

Does it make sense?

[asbjornu]

Right. But wouldn't then increment: None work, since for the specific branch we don't want to increment either Major, Minor or Patch?

[HHobeck]

Right. But wouldn't then increment: None work, since for the specific branch we don't want to increment either Major, Minor or Patch?

But we want to increment the version on the branch but only if the commit was not released (marked not with a tag).

Edit: If you increment the version with value 1.0.0-1 with none the result is 1.0.0-2 on branch with empty label. Which is not what you want.

[HHobeck]

Maybe the following enum values are better:

internal enum TakeIncrementedVersion
{
    Never,
    IfNotReleased/Tagged,
    Always
}

[HHobeck]

prevent-increment:
    when-versioned-branch-merged: true
    when-tagged: true

Actually I would like to do this in a separate PR if you not mind. Please review the changes and merge it to main. Thank you.

[arturcic]

@HHobeck @asbjornu I'm done with the review, included the new schema changes.

@asbjornu when you have the time please have the review as well and then we can get it to the point to merge it.

[arturcic]

@HHobeck please update your branch then rebase on top of origin/main

[HHobeck]

I think this PR can be merged right!?

[arturcic]

@HHobeck I think @asbjornu said he will try to review it this weekend.
I'd say we merge it on Monday if @asbjornu doesn't manage to review.

[arturcic]

@asbjornu is anything left to review or we can merge?

[mergify]

Thank you @HHobeck for your contribution!