Skip to content

Commit 784b871

Browse files
authored
Update Mergify rules (#1146)
* Update Mergify rules This change was required due to the deprection of our current setup (https://blog.mergify.io/strict-mode-deprecation/). It was shown in the mergify results tab on our PRs and would cause the Mergify setup to fail from December on. I hope that I nowconfigured everything correctly. * Fix mergify to use Github Actions
1 parent d4aefcf commit 784b871

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

.mergify.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1+
queue_rules:
2+
- name: default
3+
conditions:
4+
- "status-success=test,format" # "GitHub Actions works slightly differently [...], only the job name is used."
5+
16
pull_request_rules:
27
- name: Automatic merge passing PR on up to date branch with approving CR
38
conditions:
9+
- "base=develop"
410
- "#approved-reviews-by>=1"
511
- "#review-requested=0"
612
- "#changes-requested-reviews-by=0"
7-
- "status-success=Travis CI - Pull Request"
13+
- "status-success=test,format"
814
- "label!=work-in-progress"
915
actions:
10-
merge:
11-
method: merge
12-
strict: smart+fasttrack
13-
- name: Request Brian to review changes on core api.
16+
queue:
17+
name: default
18+
19+
- name: Request Brian to review changes to the core API
1420
conditions:
1521
- "-files~=^can/interfaces/$"
1622
- "-closed"
@@ -20,7 +26,7 @@ pull_request_rules:
2026
users:
2127
- hardbyte
2228

23-
- name: delete head branch after merge
29+
- name: Delete head branch after merge
2430
conditions:
2531
- merged
2632
actions:

0 commit comments

Comments
 (0)