diff --git a/.github/mergify.yml b/.github/mergify.yml index 0da48caa0..965a94a9a 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,17 +1,29 @@ pull_request_rules: -- name: automatic merge after review +- name: Automatically merge PRs conditions: - check-success=continuous-integration/drone/pr - - check-success=DCO - - check-success=CodeFactor - - check-success=codespell - "#approved-reviews-by>=2" - approved-reviews-by=@longhorn/maintainer actions: merge: method: rebase + +- name: Automatically merge Renovate PRs + conditions: + - check-success=continuous-integration/drone/pr + - author = renovate[bot] + actions: + merge: + method: rebase + +- name: Automatically approve Renovate PRs + conditions: + - author = renovate[bot] + actions: + review: + type: APPROVE -- name: ask to resolve conflict +- name: Ask to resolve conflict conditions: - conflict actions: