Skip to content

Commit fc85fa0

Browse files
committed
Add support for mergify
1 parent d4bfa76 commit fc85fa0

File tree

2 files changed

+59
-3
lines changed

2 files changed

+59
-3
lines changed

.github/dependabot.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "npm"
4-
directory: "/"
3+
- package-ecosystem: 'npm'
4+
directory: '/'
55
schedule:
6-
interval: "daily"
6+
interval: 'daily'
7+
allow:
8+
- dependency-type: "all"
9+
open-pull-requests-limit: 15
10+
labels:
11+
- "waiting"
12+
- "dependencies"

.mergify.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
pull_request_rules:
2+
- name: automatic merge
3+
conditions:
4+
- and: &base_checks
5+
- base=main
6+
- -label~=^acceptance-tests-needed|not-ready
7+
- "#check-failure=0"
8+
- "#check-pending=0"
9+
- linear-history
10+
- and:
11+
- "#approved-reviews-by>=2"
12+
- "#changes-requested-reviews-by=0"
13+
- "#review-requested=0"
14+
actions: &merge
15+
merge:
16+
method: merge
17+
- name: automatic merge on special label
18+
conditions:
19+
- and: *base_checks
20+
- and:
21+
- base=main
22+
- "label=merge-fast"
23+
actions: *merge
24+
- name: automatic merge for dependabot updates
25+
conditions:
26+
- and: *base_checks
27+
- and:
28+
- base=main
29+
- author=dependabot[bot]
30+
- "label=waited"
31+
actions:
32+
merge:
33+
method: squash
34+
- name: ask to resolve conflict
35+
conditions:
36+
- conflict
37+
actions:
38+
comment:
39+
message: This pull request is now in conflicts. Could you fix it? 🙏
40+
- name: Wait for 2 days before validating merge
41+
actions:
42+
label:
43+
add:
44+
- waited
45+
remove:
46+
- waiting
47+
conditions:
48+
- and:
49+
- updated-at<2 days ago
50+
- author=dependabot[bot]

0 commit comments

Comments
 (0)