octo
/
Zebra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci(Mergify): Fix invalid mergify config on main branch (#4120) 

Signed-off-by: teor <teor@riseup.net>
This commit is contained in:
teor 2022-04-14 17:15:57 +10:00 committed by GitHub
parent 04d52bfa3b
commit 2041d69312
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/mergify.yml vendored
View File

@ -4,8 +4,8 @@ queue_rules:
allow_checks_interruption: False
speculative_checks: 1
batch_size: 5
# Just wait 2 minutes to embark hotfixes together in a merge train
batch_max_wait_time: 120
# Wait a short time to embark hotfixes together in a merge train
batch_max_wait_time: "2 minutes"
conditions:
# Mergify automatically applies status check, approval, and conversation rules,
# which are the same as the GitHub main branch protection rules
@ -17,8 +17,8 @@ queue_rules:
allow_checks_interruption: True
speculative_checks: 1
batch_size: 5
# Wait 10 minutes to embark high priority tickets together in a merge train
batch_max_wait_time: 300
# Wait for a few minutes to embark high priority tickets together in a merge train
batch_max_wait_time: "5 minutes"
conditions:
- base=main
@ -27,8 +27,8 @@ queue_rules:
allow_checks_interruption: True
speculative_checks: 1
batch_size: 5
# Wait 10 minutes to embark low priority tickets together in a merge train
batch_max_wait_time: 300
# Wait a bit longer to embark low priority tickets together in a merge train
batch_max_wait_time: "10 minutes"
conditions:
- base=main
@ -70,4 +70,4 @@ pull_request_rules:
actions:
queue:
name: low
method: squash
method: squash