Skip to content

Commit d9e73c0

Browse files
mergify[bot]abompard
authored andcommitted
ci(mergify): upgrade configuration to current format
1 parent a31f7e1 commit d9e73c0

File tree

1 file changed

+47
-26
lines changed

1 file changed

+47
-26
lines changed

.mergify.yml

+47-26
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
queue_rules:
2-
- name: default
3-
conditions:
2+
- name: duplicated default from default
3+
queue_conditions:
4+
- label!=no-mergify
5+
- -draft
6+
- approved-reviews-by=@fedora-infra/fedora-messaging-maintainers
7+
- "#changes-requested-reviews-by=0"
8+
- status-success=DCO
9+
- status-success=Misc tests (checks)
10+
- status-success=Unit tests (py38-unittest)
11+
- status-success=Unit tests (py39-unittest)
12+
- status-success=Unit tests (py310-unittest)
13+
- status-success=Unit tests (py311-unittest)
14+
- status-success=Unit tests (py312-unittest)
15+
- status-success=Integration tests (py38-integration)
16+
- status-success=Integration tests (py39-integration)
17+
- status-success=Integration tests (py310-integration)
18+
- status-success=Integration tests (py311-integration)
19+
- status-success=Integration tests (py312-integration)
20+
merge_conditions:
421
# Conditions to get out of the queue (= merged)
522
- status-success=Misc tests (checks)
623
# - status-success=Misc tests (licenses)
@@ -14,22 +31,29 @@ queue_rules:
1431
- status-success=Integration tests (py310-integration)
1532
- status-success=Integration tests (py311-integration)
1633
- status-success=Integration tests (py312-integration)
17-
18-
19-
pull_request_rules:
20-
21-
- name: default
22-
actions:
23-
queue:
24-
name: default
25-
method: rebase
26-
conditions:
34+
merge_method: rebase
35+
- name: duplicated default from default-from-fedora-messaging-team
36+
queue_conditions:
2737
- label!=no-mergify
2838
- -draft
29-
- approved-reviews-by=@fedora-infra/fedora-messaging-maintainers
39+
- author=@fedora-infra/fedora-messaging-maintainers
40+
- "#approved-reviews-by>=1"
3041
- "#changes-requested-reviews-by=0"
3142
- status-success=DCO
3243
- status-success=Misc tests (checks)
44+
- status-success=Unit tests (py38-unittest)
45+
- status-success=Unit tests (py39-unittest)
46+
- status-success=Unit tests (py310-unittest)
47+
- status-success=Unit tests (py311-unittest)
48+
- status-success=Unit tests (py312-unittest)
49+
- status-success=Integration tests (py38-integration)
50+
- status-success=Integration tests (py39-integration)
51+
- status-success=Integration tests (py310-integration)
52+
- status-success=Integration tests (py311-integration)
53+
- status-success=Integration tests (py312-integration)
54+
merge_conditions:
55+
# Conditions to get out of the queue (= merged)
56+
- status-success=Misc tests (checks)
3357
# - status-success=Misc tests (licenses)
3458
- status-success=Unit tests (py38-unittest)
3559
- status-success=Unit tests (py39-unittest)
@@ -41,20 +65,10 @@ pull_request_rules:
4165
- status-success=Integration tests (py310-integration)
4266
- status-success=Integration tests (py311-integration)
4367
- status-success=Integration tests (py312-integration)
44-
45-
# Merge contributions from the team as long as they have one approval by anyone
46-
- name: default-from-fedora-messaging-team
47-
actions:
48-
queue:
49-
name: default
50-
method: rebase
68+
merge_method: rebase
69+
- name: default
5170
conditions:
52-
- label!=no-mergify
53-
- -draft
54-
- author=@fedora-infra/fedora-messaging-maintainers
55-
- "#approved-reviews-by>=1"
56-
- "#changes-requested-reviews-by=0"
57-
- status-success=DCO
71+
# Conditions to get out of the queue (= merged)
5872
- status-success=Misc tests (checks)
5973
# - status-success=Misc tests (licenses)
6074
- status-success=Unit tests (py38-unittest)
@@ -67,3 +81,10 @@ pull_request_rules:
6781
- status-success=Integration tests (py310-integration)
6882
- status-success=Integration tests (py311-integration)
6983
- status-success=Integration tests (py312-integration)
84+
85+
pull_request_rules:
86+
87+
- name: default + default-from-fedora-messaging-team
88+
conditions: []
89+
actions:
90+
queue:

0 commit comments

Comments
 (0)