#19194 Modernize our cherry-picking workflow/scripts
Issue created by
thejcannon
With the recent shift of cherry-picking workflow to GitHub Actions, we should change our scripts/docs to lean into the new workflow.
Specifically I think there's a few cherry-picking instances:
Instances:
• Cherry-picking done by GHA
• This is most likely triggered by merging a "needs-cherry-pick" PR
• But also can be triggered in other cases. Like if the milestone was missing, or someone decides after merging it should be picked
• Cherry-picking done by people
• Ideally, this should ONLY be done in the case of a merge conflict
With those in mind, I suggest that we shift the logic of our scripts to focus on GHA, as that's the default and much more common case. For local picking, we can have a different/slimmer set of scripts more dedicated to the use-case.
Additionally, I think it'd be excellent if the GHA picker:
• Labeled PRs it failed to pick
• Commented on them to notify the author
• This comment can and should explain the steps require to fixing
So in a world where we comment on PR, we may not need dedicated scripts for the user if the resolution steps are straightforward.
pantsbuild/pants