Skip to content

Commit a1ee4e9

Browse files
committed
chore(ci): update mergify bot breaking change
1 parent f2a4818 commit a1ee4e9

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

Diff for: .github/mergify.yml

+13-11
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
1+
queue_rules:
2+
- name: default
3+
conditions:
4+
# Conditions to get out of the queue (= merged)
5+
- check-success=Semantic Pull Request
6+
- "#approved-reviews-by>=1"
7+
- -title~=(WIP|wip)
8+
- -label~="do-not-merge"
9+
- "#changes-requested-reviews-by=0"
10+
111
pull_request_rules:
212
- name: automatic merge for Dependabot pull requests
313
conditions:
414
- author~=^dependabot(|-preview)\[bot\]$
515
# - check-success=build # matrix jobs aren't working in mergify
6-
- -label~="do-not-merge"
7-
- "#approved-reviews-by>=1" # until we exclude major versions in dependabot
816
actions:
9-
merge:
10-
strict: false
17+
queue:
1118
method: squash
1219
commit_message: title+body
1320

1421
- name: Automatic merge ⬇️ on approval ✔
1522
conditions:
1623
- base!=master
17-
- "#approved-reviews-by>=1"
18-
- "#changes-requested-reviews-by=0"
19-
- -title~=(WIP|wip)
2024
# - check-success=build # matrix jobs aren't working in mergify
21-
- check-success=Semantic Pull Request
22-
- body~=(?m)^\[X\] Meet tenets criteria
25+
- "#approved-reviews-by>=2"
2326
actions:
24-
merge:
25-
strict: smart
27+
queue:
2628
method: squash
2729
strict_method: merge
2830
commit_message: title+body

0 commit comments

Comments
 (0)