Skip to content

Commit a78b3f3

Browse files
chore: mergify does no longer support queue_conditions != merge_conditions for require status checks to be up to date (#5891)
> Configuration not compatible with a branch protection setting The branch protection setting Require branches to be up to date before merging is not compatible with max_parallel_checks>1, queue_conditions != merge_conditions and must be unset.
1 parent bf8e52b commit a78b3f3

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

.mergify.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pull_request_rules:
4949
queue:
5050
queue_rules:
5151
- name: default
52-
queue_conditions:
52+
queue_conditions: &queue_conditions
5353
- '#changes-requested-reviews-by=0'
5454
- or:
5555
- 'approved-reviews-by=@nektos/act-committers'
@@ -69,10 +69,5 @@ queue_rules:
6969
- check-success=codecov/patch
7070
- check-success=codecov/project
7171
- check-success=snapshot
72-
merge_conditions:
73-
- check-success=lint
74-
- check-success=test-linux
75-
- check-success=codecov/patch
76-
- check-success=codecov/project
77-
- check-success=snapshot
72+
merge_conditions: *queue_conditions
7873
merge_method: squash

0 commit comments

Comments
 (0)