Skip to content

Commit 2ab4067

Browse files
committed
mergify: update YAML config
Problem: Mergify is complaining that the setting to require branches to be up to date before merging is not compatible with draft PR checks. Update the Mergify configuration to enable in-place checks by setting merge_queue.max_parallel_checks to 1 and setting every queue_rule's batch_size to 1.
1 parent 5ee82e6 commit 2ab4067

File tree

1 file changed

+16
-20
lines changed

1 file changed

+16
-20
lines changed

.mergify.yml

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,25 @@
11
queue_rules:
22
- name: default
3-
queue_conditions:
4-
- base=master
5-
- status-success="validate commits"
6-
- label="merge-when-passing"
7-
- label!="work-in-progress"
8-
- "approved-reviews-by=@flux-framework/docs"
9-
- "#approved-reviews-by>0"
10-
- "#changes-requested-reviews-by=0"
11-
- -title~=^\[*[Ww][Ii][Pp]
12-
merge_conditions:
3+
batch_size: 1
4+
update_method: rebase
5+
merge_method: merge
6+
7+
# Avoid temporary branches created by mergify for parallel checks
8+
# These do not work with the pr-validator since the temporary PR
9+
# branch is updated with a merge commit.
10+
merge_queue:
11+
max_parallel_checks: 1
12+
13+
pull_request_rules:
14+
- name: rebase and merge when passing all checks
15+
conditions:
1316
- base=master
14-
- status-success="docs/readthedocs.org:flux-framework"
15-
- status-success="validate commits"
1617
- label="merge-when-passing"
1718
- label!="work-in-progress"
18-
- "approved-reviews-by=@flux-framework/docs"
19+
- -title~="^\[*(WIP|wip)"
20+
- "approved-reviews-by=@flux-framework/core"
1921
- "#approved-reviews-by>0"
2022
- "#changes-requested-reviews-by=0"
21-
- -title~=^\[*[Ww][Ii][Pp]
22-
merge_method: merge
23-
update_method: rebase
24-
25-
pull_request_rules:
26-
- name: refactored queue action rule
27-
conditions: []
2823
actions:
2924
queue:
25+
name: default

0 commit comments

Comments
 (0)