search

dotnet / extensions

This repository contains a suite of libraries that provide facilities commonly needed when creating production-ready applications.
MIT License
2.59k stars 743 forks source link

Onboard new inter-branch merge flow [Configuration] #5239

Closed f-alizada closed 3 months ago

f-alizada commented 3 months ago

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

Microsoft Reviewers: Open in CodeFlow
f-alizada commented 3 months ago

@joperezr Could you please check this PR/ is this something that you would like to take into the dotnet/extension?

RussKie commented 3 months ago

@f-alizada could you help us understand how we could check this PR? Is this ready for review? How do we know it is working? Thank you

joperezr commented 3 months ago

I am so sorry for the delay in the response here, I've been swamped lately. Thank you for the PR, we want to keep the main to dev subscription, but the release/8.0 one we don't really need it anymore.

joperezr commented 3 months ago

@f-alizada could you help us understand how we could check this PR? Is this ready for review? How do we know it is working?

Thank you

@RussKie sorry I have context here, they are deprecating the inter-branch flow PRs from maestro and instead moving to GH Actions, so this is the PR moving the existing subscriptions we have in maestro to that.

f-alizada commented 3 months ago

Thank you @joperezr! The PR is updated: removed the mapping from release/8.0 to main, and changed the targeting merge branch for the PR: #5240

@RussKie Thank you for the questions! Let me try to answer them

Is this ready for review?

Yes the PR is ready for the review. The reason of the PR being in the draft state is because this PR is a suggestion on the usage of the workflow. The workflow provides possibility to configure the file_name of configuration file, the branch from where the configuration should be read, some specific triggers for the workflow that repository will benefit from having. It is up to the repository maintaners/owners to decide how to use the workflow.

Could you us understand how we could check this PR? How do we know it is working?

The PR and the workflow could be checked on the forked repository, or merged and monitored. If the merge PR by the github actions is not created and the merge failed, we will investigate that case by case. In case the automerge is created, then the subscription from the legacy flow is removed.

So far this workflow is already being used by multiple repositories

Please let me know if that helps :)

RussKie commented 3 months ago

Thank you for the explanation. If you're certain it is working - :shipit: