diff --git a/.github/mergify.yml b/.github/mergify.yml index a864b6e..63019aa 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -6,3 +6,19 @@ pull_request_rules: label: toggle: - conflict + + - name: Automatic merge on approval + conditions: + - "#commits-behind=0" + - or: + - "#approved-reviews-by>=1" + - label=ci:auto-merge + - not: + and: + - "head*=renovate/lockfile-maintenance-*" + - "created-at>24h ago" + - base=master + - check-success=build + actions: + merge: + method: squash diff --git a/.github/renovate.json b/.github/renovate.json index a70e910..6783861 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -18,5 +18,10 @@ ], "separateMajorMinor": false, "updateNotScheduled": false, - "rangeStrategy": "bump" + "rangeStrategy": "bump", + "labels": [ + "ci:auto-merge", + "dependencies" + ], + "prConcurrentLimit": 3 }