Skip to content

Commit 46857d0

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

File tree

1 file changed

+60
-43
lines changed

1 file changed

+60
-43
lines changed

.mergify.yml

Lines changed: 60 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,66 @@ 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+
disallow_checks_interruption_from_queues:
32+
- default
33+
merge_method: merge
34+
- name: duplicated lowprio from automatic merge from trivy
35+
queue_conditions:
36+
- and: *CheckRuns
37+
- "check-success=Rule: Conventional Commit (post_check)"
38+
- head=trivy/daily-report
39+
- author=mergify-ci-bot
40+
- label!=manual merge
41+
- label!=new CVE
42+
- "#commits=1"
43+
merge_conditions:
44+
- and:
45+
- check-success=linters
46+
- schedule=Mon-Fri 09:00-17:00[Europe/Paris]
47+
allow_inplace_checks: true
48+
batch_size: 7
49+
batch_max_wait_time: 5min
50+
queue_branch_merge_method: fast-forward
51+
disallow_checks_interruption_from_queues:
52+
- default
53+
commit_message_template:
54+
merge_method: merge
55+
- name: duplicated lowprio from automatic merge from dependabot
56+
queue_conditions:
57+
- and: *CheckRuns
58+
- "check-success=Rule: Conventional Commit (post_check)"
59+
- author=dependabot[bot]
60+
- label!=manual merge
61+
- "#commits=1"
62+
merge_conditions:
63+
- and:
64+
- check-success=linters
65+
- schedule=Mon-Fri 09:00-17:00[Europe/Paris]
66+
allow_inplace_checks: true
67+
batch_size: 7
68+
batch_max_wait_time: 5min
69+
queue_branch_merge_method: fast-forward
70+
disallow_checks_interruption_from_queues:
71+
- default
72+
commit_message_template:
73+
merge_method: merge
1474
- name: lowprio
1575
allow_inplace_checks: true
1676
conditions:
@@ -62,49 +122,6 @@ pull_request_rules:
62122
- label!=manual merge
63123
actions:
64124
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-
108125
- name: request review
109126
conditions:
110127
- -author=dependabot[bot]

0 commit comments

Comments
 (0)