Skip to content

Commit 7a79da7

Browse files
authored
Merge pull request #410 from nix-community/mergify/configuration-deprecated-update
ci(mergify): upgrade configuration to current format
2 parents 83900d5 + 3e5c155 commit 7a79da7

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

.mergify.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
queue_rules:
22
- name: default
3+
queue_conditions:
4+
- base=master
5+
- label~=merge-queue|dependencies
36
merge_conditions:
47
- check-success=buildbot/nix-build
5-
defaults:
6-
actions:
7-
queue:
8-
allow_merging_configuration_change: true
9-
method: rebase
8+
merge_method: rebase
9+
1010
pull_request_rules:
1111
- name: merge using the merge queue
12-
conditions:
13-
- base=master
14-
- label~=merge-queue|dependencies
12+
conditions: []
1513
actions:
16-
queue: {}
14+
queue:

0 commit comments

Comments
 (0)