argoproj / argo-workflows

Workflow Engine for Kubernetes
https://argo-workflows.readthedocs.io/
Apache License 2.0
14.56k stars 3.12k forks source link

Enable optional merge queue for this repo #12688

Open terrytangyuan opened 4 months ago

terrytangyuan commented 4 months ago

See https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue

terrytangyuan commented 4 months ago
agilgur5 commented 4 months ago

For reference, this is a follow-up to yesterday's Contributor Meeting, which itself was a follow-up to https://github.com/argoproj/argo-workflows/pull/12610#issuecomment-1937868334 (and further comments) and two prior Slack discussions

terrytangyuan commented 3 months ago

@agilgur5 Do you know any example repos that have this enabled?

agilgur5 commented 3 months ago

Not off the top of my head unfortunately. Been working on this repo primarily for the past bit and merge queues apparently can only be used for repos of an org (and not for personal repos), so I couldn't use my own as examples.

k8s used to have Prow or the k8s bot do this as far as I remember, but some things have changed once GitHub had native features. Bors is the bot that predates the native GH feature, and since it's a bot you can search for its comments (e.g. https://github.com/bors-ng/bors-ng/pull/142). Merge queues are more similar to the auto-merge feature in that it changes the CI status and leaves a little icon in the PR IIRC, which is not searchable

agilgur5 commented 3 months ago

Ah here's a CNCF example: https://github.com/cncf/presentations/pull/186.

Merge queues are more similar to the auto-merge feature in that it changes the CI status and leaves a little icon in the PR IIRC, which is not searchable

See the little icons that say "added this pull request to the merge queue" and "Merged via the queue": Screenshot 2024-03-26 at 4 24 32 AM

The feature also adds this link: https://github.com/cncf/presentations/queue/main

And you can see the github-merge-queue[bot] in the (relatively new) "Activity" view, where it creates and deletes temporary branches in order to test: https://github.com/cncf/presentations/activity. But it does not itself make comments, so I found that not by searching on GitHub but by a simple "github merge queue cncf" google search, which had crawled the activity view.