Skip to content

Commit 25395d8

Browse files
authored
Merge pull request #464 from grondo/mergify-update
mergify: remove explicit status checks
2 parents c600f83 + 25fde0c commit 25395d8

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

.mergify.yml

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,18 @@
11
queue_rules:
22
- name: default
3-
queue_conditions:
3+
update_method: rebase
4+
merge_method: merge
5+
6+
pull_request_rules:
7+
- name: rebase and merge when passing all checks
8+
conditions:
49
- base=master
510
- label="merge-when-passing"
611
- label!="work-in-progress"
7-
- "approved-reviews-by=@flux-framework/core"
8-
- "#approved-reviews-by>0"
9-
- "#changes-requested-reviews-by=0"
1012
- -title~="^\[*(WIP|wip)"
11-
merge_conditions:
12-
- base=master
13-
- status-success="validate commits"
14-
- status-success="make check"
15-
- status-success="make linkcheck"
16-
- label="merge-when-passing"
17-
- label!="work-in-progress"
1813
- "approved-reviews-by=@flux-framework/core"
1914
- "#approved-reviews-by>0"
2015
- "#changes-requested-reviews-by=0"
21-
- -title~="^\[*(WIP|wip)"
22-
update_method: rebase
23-
merge_method: merge
24-
25-
pull_request_rules:
26-
- name: rebase and merge when passing all checks
27-
conditions: []
2816
actions:
2917
queue:
18+
name: default

spell.en.pws

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,3 +498,4 @@ unencoded
498498
preemptible
499499
undrain
500500
undrained
501+
Maloney

0 commit comments

Comments
 (0)