Check version bump on release branches' update - #10024
#10024Check version bump on release branches' update#10024
Conversation
JanKrivanek
left a comment
There was a problem hiding this comment.
Looks good!
I'd like to see this limited to release branches and properly handling the initial release branch commit (the 'branding PR')
I as well voiced a wish for opt out pipeline variable... but since this is only on PR build, not on the release build - it's ok without opt-out
…o release branch or the change from dotnet bot
JanKrivanek
left a comment
There was a problem hiding this comment.
Thank you for improvements!
The only reason why I request changes is the exception for maestro-bot - let's remove that one.
Otherwise it's good to go!
|
@JanKrivanek do we need to backport to active release branches? |
Yeah - good point! |
|
/backport to vs17.10 |
|
Started backporting to vs17.10: https://github.com/dotnet/msbuild/actions/runs/8752995312 |
|
/backport to vs17.9 |
|
/backport to vs17.7 |
|
Started backporting to vs17.9: https://github.com/dotnet/msbuild/actions/runs/8753015552 |
|
Started backporting to vs17.7: https://github.com/dotnet/msbuild/actions/runs/8753015998 |
|
@JanKrivanek backporting to vs17.9 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Check version bump on release branches' update
Using index info to reconstruct a base tree...
M .vsts-dotnet-ci.yml
Falling back to patching base and 3-way merge...
Auto-merging .vsts-dotnet-ci.yml
CONFLICT (content): Merge conflict in .vsts-dotnet-ci.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Check version bump on release branches' update
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@JanKrivanek an error occurred while backporting to vs17.9, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
|
@JanKrivanek backporting to vs17.7 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Check version bump on release branches' update
Using index info to reconstruct a base tree...
M .vsts-dotnet-ci.yml
Falling back to patching base and 3-way merge...
Auto-merging .vsts-dotnet-ci.yml
CONFLICT (content): Merge conflict in .vsts-dotnet-ci.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Check version bump on release branches' update
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@JanKrivanek an error occurred while backporting to vs17.7, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
|
Backported manually to vs17.7 #10042 |
Fixes #9960
Context
VersionPrefixshould be updated on each commit to our service branches (vsXX.YY) to prevent clashes of the produced packages with same version that would cause issues later down the VS insertion pipeline.Though currently we use GH polices to inform us about this, it still requires user action and can be prone to errors.
Changes Made
Add a build step checking version bump on release branches' update. If it's not updated, fail the run with the message asking to update the version.
Need to backport to active release branches.
Testing
Tested with test PR #10017.
Notes