Skip to content

Commit 2d6ec25

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent a8dac99 commit 2d6ec25

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

.mergify.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
queue_rules:
22
- name: default
3+
queue_conditions:
4+
- base=main
5+
- label~=merge-queue|auto-merge|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=main
14-
- label~=merge-queue|auto-merge|dependencies
12+
conditions: []
1513
actions:
1614
queue:

0 commit comments

Comments
 (0)