Skip to content

Commit 3b21fa2

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 751971a commit 3b21fa2

File tree

1 file changed

+119
-119
lines changed

1 file changed

+119
-119
lines changed

.mergify.yml

Lines changed: 119 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,122 @@
11
# Generated by .github/mergify/gen-config.sc
22
queue_rules:
3-
- name: default
4-
conditions:
5-
- status-success=all tests passed
6-
draft_bot_account: chiselbot
7-
update_bot_account: chiselbot
8-
merge_bot_account: chiselbot
9-
pull_request_rules:
10-
- name: automatic squash-and-merge on CI success and review
11-
conditions:
12-
- status-success=all tests passed
13-
- '#approved-reviews-by>=1'
14-
- '#changes-requested-reviews-by=0'
15-
- base=main
16-
- label="Please Merge"
17-
- label!="DO NOT MERGE"
18-
- label!="bp-conflict"
19-
actions:
20-
queue:
21-
name: default
22-
method: squash
23-
update_method: merge
24-
update_bot_account: chiselbot
25-
merge_bot_account: chiselbot
26-
- name: backport to 6.x
27-
conditions:
28-
- merged
29-
- base=main
30-
- milestone=6.x
31-
actions:
32-
backport:
33-
branches:
34-
- 6.x
35-
labels:
36-
- Backport
37-
ignore_conflicts: true
38-
label_conflicts: bp-conflict
39-
label:
40-
add:
41-
- Backported
42-
- name: backport to 5.x, 6.x
43-
conditions:
44-
- merged
45-
- base=main
46-
- milestone=5.x
47-
actions:
48-
backport:
49-
branches:
50-
- 5.x
51-
- 6.x
52-
labels:
53-
- Backport
54-
ignore_conflicts: true
55-
label_conflicts: bp-conflict
56-
label:
57-
add:
58-
- Backported
59-
- name: backport to 3.6.x, 5.x, 6.x
60-
conditions:
61-
- merged
62-
- base=main
63-
- milestone=3.6.x
64-
actions:
65-
backport:
66-
branches:
67-
- 3.6.x
68-
- 5.x
69-
- 6.x
70-
labels:
71-
- Backport
72-
ignore_conflicts: true
73-
label_conflicts: bp-conflict
74-
label:
75-
add:
76-
- Backported
77-
- name: automatic squash-and-mege of 3.6.x backport PRs
78-
conditions:
79-
- status-success=all tests passed
80-
- '#changes-requested-reviews-by=0'
81-
- base=3.6.x
82-
- label="Backport"
83-
- label!="DO NOT MERGE"
84-
- label!="bp-conflict"
85-
actions:
86-
queue:
87-
name: default
88-
method: squash
89-
update_method: merge
90-
update_bot_account: chiselbot
91-
merge_bot_account: chiselbot
92-
- name: automatic squash-and-mege of 5.x backport PRs
93-
conditions:
94-
- status-success=all tests passed
95-
- '#changes-requested-reviews-by=0'
96-
- base=5.x
97-
- label="Backport"
98-
- label!="DO NOT MERGE"
99-
- label!="bp-conflict"
100-
actions:
101-
queue:
102-
name: default
103-
method: squash
104-
update_method: merge
105-
update_bot_account: chiselbot
106-
merge_bot_account: chiselbot
107-
- name: automatic squash-and-mege of 6.x backport PRs
108-
conditions:
109-
- status-success=all tests passed
110-
- '#changes-requested-reviews-by=0'
111-
- base=6.x
112-
- label="Backport"
113-
- label!="DO NOT MERGE"
114-
- label!="bp-conflict"
115-
actions:
116-
queue:
117-
name: default
118-
method: squash
119-
update_method: merge
120-
update_bot_account: chiselbot
121-
merge_bot_account: chiselbot
3+
- name: duplicated default from automatic squash-and-merge on CI success and review
4+
queue_conditions:
5+
- status-success=all tests passed
6+
- '#approved-reviews-by>=1'
7+
- '#changes-requested-reviews-by=0'
8+
- base=main
9+
- label="Please Merge"
10+
- label!="DO NOT MERGE"
11+
- label!="bp-conflict"
12+
merge_conditions:
13+
- status-success=all tests passed
14+
draft_bot_account: chiselbot
15+
update_bot_account: chiselbot
16+
merge_bot_account: chiselbot
17+
update_method: merge
18+
merge_method: squash
19+
- name: duplicated default from automatic squash-and-mege of 3.6.x backport PRs
20+
queue_conditions:
21+
- status-success=all tests passed
22+
- '#changes-requested-reviews-by=0'
23+
- base=3.6.x
24+
- label="Backport"
25+
- label!="DO NOT MERGE"
26+
- label!="bp-conflict"
27+
merge_conditions:
28+
- status-success=all tests passed
29+
draft_bot_account: chiselbot
30+
update_bot_account: chiselbot
31+
merge_bot_account: chiselbot
32+
update_method: merge
33+
merge_method: squash
34+
- name: duplicated default from automatic squash-and-mege of 5.x backport PRs
35+
queue_conditions:
36+
- status-success=all tests passed
37+
- '#changes-requested-reviews-by=0'
38+
- base=5.x
39+
- label="Backport"
40+
- label!="DO NOT MERGE"
41+
- label!="bp-conflict"
42+
merge_conditions:
43+
- status-success=all tests passed
44+
draft_bot_account: chiselbot
45+
update_bot_account: chiselbot
46+
merge_bot_account: chiselbot
47+
update_method: merge
48+
merge_method: squash
49+
- name: duplicated default from automatic squash-and-mege of 6.x backport PRs
50+
queue_conditions:
51+
- status-success=all tests passed
52+
- '#changes-requested-reviews-by=0'
53+
- base=6.x
54+
- label="Backport"
55+
- label!="DO NOT MERGE"
56+
- label!="bp-conflict"
57+
merge_conditions:
58+
- status-success=all tests passed
59+
draft_bot_account: chiselbot
60+
update_bot_account: chiselbot
61+
merge_bot_account: chiselbot
62+
update_method: merge
63+
merge_method: squash
12264

65+
pull_request_rules:
66+
- name: backport to 6.x
67+
conditions:
68+
- merged
69+
- base=main
70+
- milestone=6.x
71+
actions:
72+
backport:
73+
branches:
74+
- 6.x
75+
labels:
76+
- Backport
77+
ignore_conflicts: true
78+
label_conflicts: bp-conflict
79+
label:
80+
add:
81+
- Backported
82+
- name: backport to 5.x, 6.x
83+
conditions:
84+
- merged
85+
- base=main
86+
- milestone=5.x
87+
actions:
88+
backport:
89+
branches:
90+
- 5.x
91+
- 6.x
92+
labels:
93+
- Backport
94+
ignore_conflicts: true
95+
label_conflicts: bp-conflict
96+
label:
97+
add:
98+
- Backported
99+
- name: backport to 3.6.x, 5.x, 6.x
100+
conditions:
101+
- merged
102+
- base=main
103+
- milestone=3.6.x
104+
actions:
105+
backport:
106+
branches:
107+
- 3.6.x
108+
- 5.x
109+
- 6.x
110+
labels:
111+
- Backport
112+
ignore_conflicts: true
113+
label_conflicts: bp-conflict
114+
label:
115+
add:
116+
- Backported
117+
- name: automatic squash-and-mege of 3.6.x backport PRs + automatic squash-and-mege
118+
of 5.x backport PRs + automatic squash-and-mege of 6.x backport PRs + automatic
119+
squash-and-merge on CI success and review
120+
conditions: []
121+
actions:
122+
queue:

0 commit comments

Comments
 (0)