Compare commits

..

No commits in common. "1a45bf286ffe2ac83cde8d6a22f9c50f7a210255" and "727627f1da8f1c558486a6552fdcae7ccb0cb503" have entirely different histories.

2 changed files with 2 additions and 6 deletions

View file

@ -1,6 +1,6 @@
merge_queue:
mode: serial
max_parallel_checks: 5
max_parallel_checks: 1
queue_controls_comment: false
merge_protections_settings:
@ -14,16 +14,12 @@ merge_protections:
- name: require-review-and-ci
if:
- base = main
- -draft
success_conditions:
- github-review-decision = APPROVED
- check-success = "ci / ci"
queue_rules:
- name: default
batch_size: 3
batch_max_wait_time: 30 seconds
checks_timeout: 10 min
queue_conditions:
- base = main
- -draft

View file

@ -26,7 +26,7 @@ The two sanctioned deploy paths are merge to `main` triggering the pipeline and
### Merge queue
Consumer repos extend `.mergify.yml` via `extends: .github`. Mergify auto-queues when it is awake. The default queue tests up to three PRs together on a draft branch so it does not push onto the original PR. Each PR still squash-merges on its own. Merge protections skip those drafts. Pending queue checks time out after 10 minutes. To kick a stuck PR, apply the `queue ready` label. That does not bypass `ci / ci` or `APPROVED`. Do not use `queued`; Mergify applies that while a PR is in the queue.
Consumer repos extend `.mergify.yml` via `extends: .github`. Mergify still auto-queues when it is awake. To kick a stuck PR, apply the `queue ready` label. That does not bypass `ci / ci` or `APPROVED`. Do not use `queued`; Mergify applies that while a PR is in the queue.
## What's in here