Skip to content

Commit ecb01ad

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent b89c318 commit ecb01ad

File tree

1 file changed

+62
-45
lines changed

1 file changed

+62
-45
lines changed

.mergify.yml

Lines changed: 62 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,60 @@ queue_rules:
1111
conditions:
1212
- and: *CheckRuns
1313
- schedule=Mon-Fri 09:00-17:30[Europe/Paris]
14+
- name: duplicated lowprio from automatic merge for clifus version bump
15+
queue_conditions:
16+
- and: *CheckRuns
17+
- "check-success=Rule: Conventional Commit (post_check)"
18+
- author=mergify-ci-bot
19+
- label!=manual merge
20+
- "title~=^chore: bump"
21+
- "#commits=1"
22+
- head~=^clifus/
23+
merge_conditions:
24+
- and:
25+
- check-success=linters
26+
- schedule=Mon-Fri 09:00-17:00[Europe/Paris]
27+
allow_inplace_checks: true
28+
batch_size: 7
29+
batch_max_wait_time: 5min
30+
queue_branch_merge_method: fast-forward
31+
merge_method: merge
32+
- name: duplicated lowprio from automatic merge from trivy
33+
queue_conditions:
34+
- and: *CheckRuns
35+
- "check-success=Rule: Conventional Commit (post_check)"
36+
- head=trivy/daily-report
37+
- author=mergify-ci-bot
38+
- label!=manual merge
39+
- label!=new CVE
40+
- "#commits=1"
41+
merge_conditions:
42+
- and:
43+
- check-success=linters
44+
- schedule=Mon-Fri 09:00-17:00[Europe/Paris]
45+
allow_inplace_checks: true
46+
batch_size: 7
47+
batch_max_wait_time: 5min
48+
queue_branch_merge_method: fast-forward
49+
commit_message_template:
50+
merge_method: merge
51+
- name: duplicated lowprio from automatic merge from dependabot
52+
queue_conditions:
53+
- and: *CheckRuns
54+
- "check-success=Rule: Conventional Commit (post_check)"
55+
- author=dependabot[bot]
56+
- label!=manual merge
57+
- "#commits=1"
58+
merge_conditions:
59+
- and:
60+
- check-success=linters
61+
- schedule=Mon-Fri 09:00-17:00[Europe/Paris]
62+
allow_inplace_checks: true
63+
batch_size: 7
64+
batch_max_wait_time: 5min
65+
queue_branch_merge_method: fast-forward
66+
commit_message_template:
67+
merge_method: merge
1468
- name: lowprio
1569
allow_inplace_checks: true
1670
conditions:
@@ -19,8 +73,6 @@ queue_rules:
1973
batch_size: 7
2074
batch_max_wait_time: 5min
2175
queue_branch_merge_method: fast-forward
22-
disallow_checks_interruption_from_queues:
23-
- default
2476

2577
pull_request_rules:
2678
- name: automatic merge for hotfix
@@ -62,49 +114,6 @@ pull_request_rules:
62114
- label!=manual merge
63115
actions:
64116
queue:
65-
66-
- name: automatic merge for clifus version bump
67-
conditions:
68-
- and: *CheckRuns
69-
- "check-success=Rule: Conventional Commit (post_check)"
70-
- author=mergify-ci-bot
71-
- label!=manual merge
72-
- "title~=^chore: bump"
73-
- "#commits=1"
74-
- head~=^clifus/
75-
actions:
76-
queue:
77-
name: lowprio
78-
method: merge
79-
80-
- name: automatic merge from trivy
81-
conditions:
82-
- and: *CheckRuns
83-
- "check-success=Rule: Conventional Commit (post_check)"
84-
- head=trivy/daily-report
85-
- author=mergify-ci-bot
86-
- label!=manual merge
87-
- label!=new CVE
88-
- "#commits=1"
89-
actions:
90-
queue:
91-
name: lowprio
92-
commit_message_template:
93-
method: merge
94-
95-
- name: automatic merge from dependabot
96-
conditions:
97-
- and: *CheckRuns
98-
- "check-success=Rule: Conventional Commit (post_check)"
99-
- author=dependabot[bot]
100-
- label!=manual merge
101-
- "#commits=1"
102-
actions:
103-
queue:
104-
name: lowprio
105-
method: merge
106-
commit_message_template:
107-
108117
- name: request review
109118
conditions:
110119
- -author=dependabot[bot]
@@ -122,3 +131,11 @@ pull_request_rules:
122131

123132
merge_queue:
124133
max_parallel_checks: 5
134+
priority_rules:
135+
- name: priority for queue `hotfix`
136+
conditions: []
137+
priority: 2500
138+
- name: priority for queue `default`
139+
conditions:
140+
- schedule=Mon-Fri 09:00-17:30[Europe/Paris]
141+
priority: 2250

0 commit comments

Comments
 (0)