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

add Mergify config for high priority PRs #10353

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

geekosaur
Copy link
Collaborator

@geekosaur geekosaur commented Sep 14, 2024

This allows us to interrupt the merge queue for high priority PRs. It's using the "priority: high 🔥" label currently.

Fixes: #10352

Template B: This PR does not modify behaviour or interface

E.g. the PR only touches documentation or tests, does refactorings, etc.

Include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions). Mergify configuration is only read from master

@geekosaur
Copy link
Collaborator Author

geekosaur commented Sep 14, 2024

This won't interfere with our usual use of the priority label, because we either commit those directly or set the "merge delay passed" label (usually to fix CI breakage). It's only if we set the label and a merge label that it will come into play. If anything, it will make the latter case work better — but since CI is almost always broken in that case, there probably won't be anything to interrupt.

@geekosaur
Copy link
Collaborator Author

Added an extra priority rule to automatically bump merges directly to release branches (i.e. not backports) on the grounds that we're probably in a release cycle in that case. High priority PRs still override these.

@geekosaur geekosaur added merge me Tell Mergify Bot to merge attention: needs-review and removed attention: needs-review merge me Tell Mergify Bot to merge labels Sep 14, 2024
@geekosaur
Copy link
Collaborator Author

geekosaur commented Sep 14, 2024

There's one more possible change to consider: if a PR has the "priority: high" label, automatically skip the cooldown period. That's a 3 line change to the code that adds the "merge delay passed" label, one of which is just a reindent. Note that you still have to set a merge label.

@ulysses4ever
Copy link
Collaborator

Yeah, auto-skip for the delay did for cross my mind. Would be a cool improvement, I think.

@geekosaur
Copy link
Collaborator Author

As it is spoken….

This allows is to interrupt the merge queue for high priority PRs.
It's using the "priority: high 🔥" label currently.

Fixes: haskell#10352
@geekosaur geekosaur added merge me Tell Mergify Bot to merge and removed attention: needs-review labels Sep 20, 2024
@mergify mergify bot added the ready and waiting Mergify is waiting out the cooldown period label Sep 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
continuous-integration merge me Tell Mergify Bot to merge ready and waiting Mergify is waiting out the cooldown period
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[meta] Separate queue for high priority PRs?
3 participants