-
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
[release/6.0] Onboard new inter-branch merge flow [Workflow] #104417
[release/6.0] Onboard new inter-branch merge flow [Workflow] #104417
Conversation
Tagging subscribers to this area: @dotnet/runtime-infrastructure |
|
||
jobs: | ||
Merge: | ||
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main |
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.
Is it normal to use main
in a release branch? I would expect each release branch to use the respective release branch of arcade (and ideally at a matching commit to that arcade which is ingested in the repo). @mmitche
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.
We use main in arcade for publishing and other common automation (including this automation in its current form). The scripting for inter-branch merging has changed minimally over the years and isn't release specific in any way.
@f-alizada @mmitche can you help explain to us what this does. I see a lot of mention of |
@mmitche so does this look good to merge? |
Yep good to go. |
Context
Onboarding new merge flow based on the github actions
Changes Made
Added github workflow for the branch.
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