Skip to content
This repository has been archived by the owner on Dec 27, 2024. It is now read-only.

Commit

Permalink
Merge pull request #17 from sircharlo/mergify/sircharlo/config-update
Browse files Browse the repository at this point in the history
ci(Mergify): configuration update
  • Loading branch information
sircharlo authored Jun 22, 2024
2 parents 0896787 + f221d3a commit b308529
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 14 deletions.
4 changes: 3 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ updates:
- package-ecosystem: 'github-actions' # See documentation for possible values
directory: '/' # Location of package manifests
schedule:
interval: 'daily'
interval: 'weekly'
- package-ecosystem: "npm" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
# Disable rebasing for npm pull requests
rebase-strategy: "disabled"
41 changes: 28 additions & 13 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,31 @@
pull_request_rules:
- name: Automatic merge for trusted authors and dependabot
#- name: Automatic merge for trusted authors and dependabot
# conditions:
# - or:
# - author=mtdvlpr
# - author=sircharlo
# - and:
# - author=dependabot[bot]
# - or:
# - title~=^Bump [^\s]+ from ([\d]+)\..+ to \1\.
# - title~=^chore\(deps\). bump [^\s]+ from ([\d]+)\..+ to \1\.
# - title~=^chore\(deps-dev\). bump [^\s]+ from ([\d]+)\..+ to \1\.
# actions:
# update:
# merge:
# method: squash
- name: Automatically merge Dependabot PRs
conditions:
- or:
- author=mtdvlpr
- author=sircharlo
- and:
- author=dependabot[bot]
- or:
- title~=^Bump [^\s]+ from ([\d]+)\..+ to \1\.
- title~=^chore\(deps\). bump [^\s]+ from ([\d]+)\..+ to \1\.
- title~=^chore\(deps-dev\). bump [^\s]+ from ([\d]+)\..+ to \1\.
- author = dependabot[bot]
actions:
update:
merge:
method: squash
#merge:
queue:

queue_rules:
# If you have other queues defined, add this at the end so it is processed last
- name: dep-update
batch_size: 10
# Wait for up to 30 minutes for the batch to fill up
batch_max_wait_time: 30 min
queue_conditions:
- author = dependabot[bot]

0 comments on commit b308529

Please sign in to comment.