|
1 | 1 | queue_rules: |
2 | 2 | - 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: |
12 | 4 | - 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 |
22 | 6 | - "#approved-reviews-by>=2" |
23 | 7 | - "#changes-requested-reviews-by=0" |
24 | | - |
25 | | - # Pull-request must be labeled with: |
26 | 8 | - 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> |
30 | 9 | - label!=do-not-merge/breaking-change |
31 | 10 | - 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 |
32 | 14 |
|
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: |
38 | 18 |
|
39 | 19 | - name: automatic merge for allcontributors pull requests |
40 | 20 | conditions: |
41 | 21 | - author=allcontributors[bot] |
42 | 22 | actions: |
43 | 23 | merge: |
44 | 24 | 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