jazzband / pip-tools

A set of tools to keep your pinned Python dependencies fresh.
https://pip-tools.rtfd.io
BSD 3-Clause "New" or "Revised" License
7.69k stars 610 forks source link

Enable testing merge queues @ GitHub Actions CI/CD #1990

Closed webknjaz closed 11 months ago

webknjaz commented 11 months ago

This patch allows the project to start using merge queues. They will still have to be enabled in the branch protection settings.

Contributor checklist
Maintainer checklist
webknjaz commented 11 months ago

Hey @jezdez, could you go to the repo's branch protection settings, and enable merge queues there, once this PR is merged?

jezdez commented 11 months ago

@webknjaz done, using squash commits

jezdez commented 11 months ago
CleanShot 2023-09-21 at 12 36 20@2x
webknjaz commented 11 months ago

@webknjaz done, using squash commits

@jezdez please, keep all the options. Squashing is harmful for history.

jezdez commented 11 months ago

@webknjaz It's not a multiple choice config, here are the options:

CleanShot 2023-09-21 at 13 41 38@2x
webknjaz commented 11 months ago

@jezdez then, use merge. It'll make them octopus. Also, I'd drop that checkbox for "only failing" — sometimes, several failing PRs composed will result in a green CI.

jezdez commented 11 months ago

@webknjaz 👍🏻

webknjaz commented 11 months ago

@jezdez thanks! This will help reduce the need for people to "merge main into PR" all the time since the merge queue will take care of checking that several PRs play well together.

chrysle commented 11 months ago

@webknjaz CI seems to have started failing after this pull request. Could you look into this?

webknjaz commented 11 months ago

That's unrelated. The scheduled nightly runs have a slightly different CI matrix which includes testing against the very last commit in the Pip's repository — that's what's failing.