Speaking of, it's not hard to write a GitHub Actio...
# developmentb
bitter-ability-32190
05/09/2023, 12:12 AMSpeaking of, it's not hard to write a GitHub Action (of which I think we ought to write more) that automatically cherry picks a PR once the original PR is merged (to each relevant branch).
In the case of a merge conflict, it'll just bail. We're not any worse off than today
Y'all think it's worth it? I can get a PoC
h
happy-kitchen-89482
05/09/2023, 12:25 AMDefinitely!
happy-kitchen-89482
05/09/2023, 12:28 AMThere would need to be some logic for cherry-picking to a milestone and all subsequent ones
b
bitter-ability-32190
05/09/2023, 12:46 AMYup, not hard though. And that's the only thing we don't have today
h
hundreds-father-404
05/09/2023, 2:02 AMWe use Mergify for Qiskit - only its cherrypick feature because we now use GitHub for a merge queue. It works pretty well.
hundreds-father-404
05/09/2023, 2:03 AMThe merge queue is pretty neat from GitHub because it ensures the PR has always run against the latest commit on main, which we don't do. It should catch some issues we've had in the past few years with broken CI
b
bitter-ability-32190
05/09/2023, 10:20 AMYeah I brought up GH merge queues here once or twice. I think the thinking was that we just don't break enough for it to be worth it
p
proud-dentist-22844
05/09/2023, 5:19 PMI think merge queue would be great - But it does require modifying the workflows to use that event type.
proud-dentist-22844
05/09/2023, 5:19 PMAnd auto-cherry-pick would be AWESOME!
h
happy-kitchen-89482
05/10/2023, 12:12 PMauto cherry-pick and auto-release (triggered by a tag) would be awesome
happy-kitchen-89482
05/10/2023, 12:12 PMAlong with non-flaky CI...