cabal icon indicating copy to clipboard operation
cabal copied to clipboard

try out merge queues

Open geekosaur opened this issue 5 months ago • 2 comments

Also enabling parallel checks, which should speed things up even more especially since Mergify forced us to separate the normal and squash-merge queues.

Also adjust the labels set for the bot to try to avoid making noise when it's being shoved straight in.


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:

  • [x] 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 on master

geekosaur avatar Jun 24 '25 19:06 geekosaur

BTW if this works then the next thing to try is to see if things we had to use merge+no rebase with work with merge me or squash+merge me. I think (per @TeofilC on Matrix) that Mergify cherry-picks commits into the queue PR, squashes them if it's the squash+merge queue, and rebases the result — which will be happening on Mergify's own local PR, not the one it's not allowed to rebase.

geekosaur avatar Jun 24 '25 23:06 geekosaur

@geekosaur this sounds terrific, thank you for researching it! and thanks to @TeofilC for pitching in!

ulysses4ever avatar Jun 25 '25 01:06 ulysses4ever

This pull request has been removed from the queue for the following reason: pull request branch update failed.

The pull request can't be updated.

You should update or rebase your pull request manually. If you do, this pull request will automatically be requeued once the queue conditions match again. If you think this was a flaky issue, you can requeue the pull request, without updating it, by posting a @mergifyio requeue comment.

mergify[bot] avatar Jun 27 '25 14:06 mergify[bot]

If we're lucky, this might even fix the above problem.

geekosaur avatar Jun 27 '25 14:06 geekosaur

Yes. Fingers crossed...

ulysses4ever avatar Jun 27 '25 15:06 ulysses4ever