Skip to content

Commit

Permalink
Add support for mergify
Browse files Browse the repository at this point in the history
  • Loading branch information
kraih committed Aug 17, 2024
1 parent e7d70f1 commit d5f2f5b
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 3 deletions.
12 changes: 9 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: "daily"
interval: 'daily'
allow:
- dependency-type: "all"
open-pull-requests-limit: 15
labels:
- "waiting"
- "dependencies"
50 changes: 50 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
pull_request_rules:
- name: automatic merge
conditions:
- and: &base_checks
- base=main
- -label~=^acceptance-tests-needed|not-ready
- "#check-failure=0"
- "#check-pending=0"
- linear-history
- and:
- "#approved-reviews-by>=2"
- "#changes-requested-reviews-by=0"
- "#review-requested=0"
actions: &merge
merge:
method: merge
- name: automatic merge on special label
conditions:
- and: *base_checks
- and:
- base=main
- "label=merge-fast"
actions: *merge
- name: automatic merge for dependabot updates
conditions:
- and: *base_checks
- and:
- base=main
- author=dependabot[bot]
- "label=waited"
actions:
merge:
method: squash
- name: ask to resolve conflict
conditions:
- conflict
actions:
comment:
message: This pull request is now in conflicts. Could you fix it? 🙏
- name: Wait for 2 days before validating merge
actions:
label:
add:
- waited
remove:
- waiting
conditions:
- and:
- updated-at<2 days ago
- author=dependabot[bot]

0 comments on commit d5f2f5b

Please sign in to comment.