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

[release/6.0] Onboard new inter-branch merge flow [Workflow] #104417

Merged

Conversation

f-alizada
Copy link
Contributor

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

@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 Jul 4, 2024
@f-alizada f-alizada requested a review from carlossanlop July 4, 2024 08:27
@carlossanlop carlossanlop added Servicing-approved Approved for servicing release area-Infrastructure and removed needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners labels Jul 4, 2024
Copy link
Contributor

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


jobs:
Merge:
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
Copy link
Member

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

Copy link
Member

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.

@ericstj
Copy link
Member

ericstj commented Jul 8, 2024

@f-alizada @mmitche can you help explain to us what this does. I see a lot of mention of inter-branch merges but I'm not sure what is meant by that. Can you give us an example?

@mmitche
Copy link
Member

mmitche commented Jul 8, 2024

@ericstj This is the automation that merges between branches in GitHub (e.g. release/6.0->release/7.0 in some repos). It generates these PRs: #104330

This automation is moving from being triggered by old Maestro, to being triggered by GitHub Actions

@carlossanlop
Copy link
Member

@mmitche so does this look good to merge?

@mmitche
Copy link
Member

mmitche commented Jul 8, 2024

Yep good to go.

@carlossanlop carlossanlop merged commit be26ec6 into dotnet:release/6.0 Jul 8, 2024
11 of 13 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Aug 9, 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.

4 participants