adam/.github
1
0
Fork 0
mirror of https://github.com/Sea-Haven-Industries/.github.git synced 2026-09-30 05:53:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(ci): unstick mergify queue timeout and draft protections

Browse source
This commit is contained in:
Adam Moussa 2026-08-25 13:50:59 -04:00
parent 2fe812e3f9
commit b363498a5f
No known key found for this signature in database
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.mergify.yml
View file

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

2
README.md
View file

@ -26,7 +26,7 @@ The two sanctioned deploy paths are merge to `main` triggering the pipeline and
### Merge queue ### 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 ## What's in here