Skip to content
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

Conversation

f-alizada
Copy link
Contributor

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

@dotnet-issue-labeler dotnet-issue-labeler bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Jun 21, 2024
@f-alizada f-alizada marked this pull request as draft June 21, 2024 10:20
@am11 am11 added area-Infrastructure and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Jun 21, 2024
Copy link
Contributor

Tagging subscribers to this area: @dotnet/runtime-infrastructure
See info in area-owners.md if you want to be subscribed.

@f-alizada
Copy link
Contributor Author

Hello @carlossanlop.
Could you please check this PR/ is this something that you would like to take into the dotnet/runtime?
The maestro inter-branch merge component will be deprecated soon and will not be creating the PR based on the configuration:

For more informatnion:
https://github.com/dotnet/dnceng/blob/main/Documentation/OnePagers/ol-maestro-deprecation.md#component-inter-branch-merge-github-action

@mmitche mmitche marked this pull request as ready for review July 3, 2024 15:58
Comment on lines +15 to +16
"release/8.0-rc":{
"MergeToBranch": "release/8.0",
Copy link
Member

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?

Copy link
Member

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.

Copy link
Contributor Author

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 :)

Copy link
Member

@carlossanlop carlossanlop left a 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.

@carlossanlop carlossanlop added the Servicing-approved Approved for servicing release label Jul 3, 2024
@carlossanlop
Copy link
Member

/ba-g unrelated failures

@carlossanlop carlossanlop merged commit 4f96b8f into dotnet:main Jul 3, 2024
145 of 148 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Aug 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-Infrastructure Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants