Skip to content

Commit f067535

Browse files
mergify[bot]ktdreyer
authored andcommitted
ci(mergify): upgrade configuration to current format
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
1 parent f5ad61b commit f067535

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

.mergify.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
queue_rules:
22
- name: default
3-
conditions:
3+
queue_conditions:
4+
- author=ktdreyer
45
- status-success=tox27
56
- status-success=tox (3.6, ubuntu-20.04)
67
- status-success=tox (3.9, ubuntu-latest)
78
- status-success=integration-tests (ga)
89
- status-success=test-collection
9-
10-
pull_request_rules:
11-
- name: automatic merge for master when CI passes
12-
conditions:
13-
- author=ktdreyer
10+
- base=master
11+
merge_conditions:
1412
- status-success=tox27
1513
- status-success=tox (3.6, ubuntu-20.04)
1614
- status-success=tox (3.9, ubuntu-latest)
1715
- status-success=integration-tests (ga)
1816
- status-success=test-collection
19-
- base=master
17+
merge_method: rebase
18+
19+
pull_request_rules:
20+
- name: automatic merge for master when CI passes
21+
conditions: []
2022
actions:
2123
queue:
22-
name: default
23-
method: rebase

0 commit comments

Comments
 (0)