-
Notifications
You must be signed in to change notification settings - Fork 4.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Onboard new inter-branch merge flow [Configuration] #103805
Onboard new inter-branch merge flow [Configuration] #103805
Conversation
Tagging subscribers to this area: @dotnet/runtime-infrastructure |
Hello @carlossanlop. For more informatnion: |
"release/8.0-rc":{ | ||
"MergeToBranch": "release/8.0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be 9.0-rc?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since we don't yet have release/9.0 or release/9.0-rc* branches, I think we're good for now to merge so we don't get blocked on Monday, but I suspect we need these lines updated.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The configuration file was prepared based on the https://github.com/dotnet/versions/blob/main/Maestro/subscriptions.json file.
If there will be a need for the new onboarding branch, please use current (from the PR) file to update the configuration for additional branches in the merge flow chain :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@f-alizada @mmitche approving with one comment to clarify.
/ba-g unrelated failures |
Context
Onboarding new merge flow based on the github actions
Changes Made
Added configuration file. The flow was copied from: https://github.com/dotnet/versions/blob/main/Maestro/subscriptions.json. Currently it will not be read or change any behaviour of the merge flow but will be used by the new workflow.
References
Documentation https://github.com/dotnet/arcade/blob/main/Documentation/Maestro/New-Inter-Branch-Merge-Approach.md
One pager: https://github.com/dotnet/dnceng/blob/main/Documentation/OnePagers/github-action-inter-branch-merge.md