ci(Mergify): Fix invalid mergify config on main branch (#4120)
Signed-off-by: teor <teor@riseup.net>
This commit is contained in:
parent
04d52bfa3b
commit
2041d69312
|
|
@ -4,8 +4,8 @@ queue_rules:
|
||||||
allow_checks_interruption: False
|
allow_checks_interruption: False
|
||||||
speculative_checks: 1
|
speculative_checks: 1
|
||||||
batch_size: 5
|
batch_size: 5
|
||||||
# Just wait 2 minutes to embark hotfixes together in a merge train
|
# Wait a short time to embark hotfixes together in a merge train
|
||||||
batch_max_wait_time: 120
|
batch_max_wait_time: "2 minutes"
|
||||||
conditions:
|
conditions:
|
||||||
# Mergify automatically applies status check, approval, and conversation rules,
|
# Mergify automatically applies status check, approval, and conversation rules,
|
||||||
# which are the same as the GitHub main branch protection rules
|
# which are the same as the GitHub main branch protection rules
|
||||||
|
|
@ -17,8 +17,8 @@ queue_rules:
|
||||||
allow_checks_interruption: True
|
allow_checks_interruption: True
|
||||||
speculative_checks: 1
|
speculative_checks: 1
|
||||||
batch_size: 5
|
batch_size: 5
|
||||||
# Wait 10 minutes to embark high priority tickets together in a merge train
|
# Wait for a few minutes to embark high priority tickets together in a merge train
|
||||||
batch_max_wait_time: 300
|
batch_max_wait_time: "5 minutes"
|
||||||
conditions:
|
conditions:
|
||||||
- base=main
|
- base=main
|
||||||
|
|
||||||
|
|
@ -27,8 +27,8 @@ queue_rules:
|
||||||
allow_checks_interruption: True
|
allow_checks_interruption: True
|
||||||
speculative_checks: 1
|
speculative_checks: 1
|
||||||
batch_size: 5
|
batch_size: 5
|
||||||
# Wait 10 minutes to embark low priority tickets together in a merge train
|
# Wait a bit longer to embark low priority tickets together in a merge train
|
||||||
batch_max_wait_time: 300
|
batch_max_wait_time: "10 minutes"
|
||||||
conditions:
|
conditions:
|
||||||
- base=main
|
- base=main
|
||||||
|
|
||||||
|
|
@ -70,4 +70,4 @@ pull_request_rules:
|
||||||
actions:
|
actions:
|
||||||
queue:
|
queue:
|
||||||
name: low
|
name: low
|
||||||
method: squash
|
method: squash
|
||||||
Loading…
Reference in New Issue