From b363498a5f7307e14d4cb60d75fab6c17f1406e3 Mon Sep 17 00:00:00 2001 From: Adam Moussa Date: Tue, 25 Aug 2026 13:50:59 -0400 Subject: [PATCH] fix(ci): unstick mergify queue timeout and draft protections --- .mergify.yml | 4 +++- README.md | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index ba842a7..8212e3c 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,6 +1,6 @@ merge_queue: mode: serial - max_parallel_checks: 1 + max_parallel_checks: 5 queue_controls_comment: false merge_protections_settings: @@ -14,6 +14,7 @@ merge_protections: - name: require-review-and-ci if: - base = main + - -draft success_conditions: - github-review-decision = APPROVED - check-success = "ci / ci" @@ -22,6 +23,7 @@ queue_rules: - name: default batch_size: 3 batch_max_wait_time: 30 seconds + checks_timeout: 10 min queue_conditions: - base = main - -draft diff --git a/README.md b/README.md index 5530f3d..750b34c 100644 --- a/README.md +++ b/README.md @@ -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. 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 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. ## What's in here