Skip to content

Commit 51dc80c

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 7846006 commit 51dc80c

File tree

1 file changed

+40
-34
lines changed

1 file changed

+40
-34
lines changed

.mergify.yml

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,63 @@
11
queue_rules:
2-
- name: default
3-
conditions:
4-
# Conditions to get out of the queue (= merged)
2+
- name: duplicated default from Merge dependency-update PRs
3+
queue_conditions:
4+
- base=master
5+
- label=dependencies
56
- check-success~=build \(2\.12\.\d+\)
67
- check-success~=build \(2\.13\.\d+\)
78
- check-success~=build \(3\.\d+\.\d+\)
8-
9-
pull_request_rules:
10-
- name: Label Scala Steward PRs
11-
conditions:
12-
- author=scala-steward
13-
actions:
14-
label:
15-
add: [dependencies, scala]
16-
17-
- name: Merge dependency-update PRs
18-
conditions:
19-
- base=master
20-
- label=dependencies
9+
merge_conditions:
10+
# Conditions to get out of the queue (= merged)
2111
- check-success~=build \(2\.12\.\d+\)
2212
- check-success~=build \(2\.13\.\d+\)
2313
- check-success~=build \(3\.\d+\.\d+\)
24-
actions:
25-
queue:
26-
name: default
27-
method: squash
28-
29-
30-
- name: Merge PRs (rebase) which are ready to merge
31-
conditions:
14+
merge_method: squash
15+
- name: duplicated default from Merge PRs (rebase) which are ready to merge
16+
queue_conditions:
3217
- label=ready-to-merge-rebase
3318
- base=master
3419
- check-success~=build \(2\.12\.\d+\)
3520
- check-success~=build \(2\.13\.\d+\)
3621
- check-success~=build \(3\.\d+\.\d+\)
3722
- "#review-requested=0"
3823
- "#changes-requested-reviews-by=0"
39-
actions:
40-
queue:
41-
name: default
42-
method: rebase
43-
44-
45-
- name: Merge PRs (squash) which are ready to merge
46-
conditions:
24+
merge_conditions:
25+
# Conditions to get out of the queue (= merged)
26+
- check-success~=build \(2\.12\.\d+\)
27+
- check-success~=build \(2\.13\.\d+\)
28+
- check-success~=build \(3\.\d+\.\d+\)
29+
merge_method: rebase
30+
- name: duplicated default from Merge PRs (squash) which are ready to merge
31+
queue_conditions:
4732
- label=ready-to-merge-squash
4833
- base=master
4934
- check-success~=build \(2\.12\.\d+\)
5035
- check-success~=build \(2\.13\.\d+\)
5136
- check-success~=build \(3\.\d+\.\d+\)
5237
- "#review-requested=0"
5338
- "#changes-requested-reviews-by=0"
39+
merge_conditions:
40+
# Conditions to get out of the queue (= merged)
41+
- check-success~=build \(2\.12\.\d+\)
42+
- check-success~=build \(2\.13\.\d+\)
43+
- check-success~=build \(3\.\d+\.\d+\)
44+
merge_method: squash
45+
- name: default
46+
conditions:
47+
# Conditions to get out of the queue (= merged)
48+
- check-success~=build \(2\.12\.\d+\)
49+
- check-success~=build \(2\.13\.\d+\)
50+
- check-success~=build \(3\.\d+\.\d+\)
51+
52+
pull_request_rules:
53+
- name: Label Scala Steward PRs
54+
conditions:
55+
- author=scala-steward
56+
actions:
57+
label:
58+
add: [dependencies, scala]
59+
- name: Merge PRs (rebase) which are ready to merge + Merge PRs (squash) which are
60+
ready to merge + Merge dependency-update PRs
61+
conditions: []
5462
actions:
5563
queue:
56-
name: default
57-
method: squash

0 commit comments

Comments
 (0)