Skip to content

Commit c906292

Browse files
committed
ci(mergify): upgrade configuration to current format
1 parent 8029e9b commit c906292

File tree

1 file changed

+14
-28
lines changed

1 file changed

+14
-28
lines changed

.mergify.yml

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,30 @@
11
queue_rules:
22
- name: default
3-
conditions:
4-
# Conditions to get out of the queue (= merged)
5-
- check-success=nventive.UnoApplicationTemplate # Replace this with your CI pipeline name
6-
7-
pull_request_rules:
8-
9-
- name: automatic strict merge when CI passes, has 2 reviews, no requests for change and is labeled 'ready-to-merge' unless labelled 'do-not-merge/breaking-change' or 'do-not-merge/work-in-progress'
10-
conditions:
11-
# Only pull-requests sent to the main branch
3+
queue_conditions:
124
- base=main
13-
14-
# All Azure builds should be green:
15-
- status-success=nventive.UnoApplicationTemplate # Replace this with your CI pipeline name
16-
17-
# CLA check must pass:
18-
#- "status-success=license/cla"
19-
20-
# Note that this only matches people with write / admin access to the repo,
21-
# see <https://doc.mergify.io/conditions.html#attribute-list>
5+
- status-success=nventive.UnoApplicationTemplate
226
- "#approved-reviews-by>=2"
237
- "#changes-requested-reviews-by=0"
24-
25-
# Pull-request must be labeled with:
268
- label=ready-to-merge
27-
28-
# Do not automatically merge pull-requests that are labelled as do-not-merge
29-
# see <https://doc.mergify.io/examples.html#id6>
309
- label!=do-not-merge/breaking-change
3110
- label!=do-not-merge/work-in-progress
11+
merge_conditions:
12+
# Conditions to get out of the queue (= merged)
13+
- check-success=nventive.UnoApplicationTemplate # Replace this with your CI pipeline name
3214

33-
# Note: mergify cannot break branch protection rules
34-
actions:
35-
queue:
36-
method: merge
37-
name: default
15+
merge_method: merge
16+
17+
pull_request_rules:
3818

3919
- name: automatic merge for allcontributors pull requests
4020
conditions:
4121
- author=allcontributors[bot]
4222
actions:
4323
merge:
4424
method: merge
25+
- name: automatic strict merge when CI passes, has 2 reviews, no requests for change
26+
and is labeled 'ready-to-merge' unless labelled 'do-not-merge/breaking-change'
27+
or 'do-not-merge/work-in-progress'
28+
conditions: []
29+
actions:
30+
queue:

0 commit comments

Comments
 (0)