diff --git a/.github/mergify.yml b/.github/mergify.yml index 2dd1aee601..391743c6ed 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -5,9 +5,8 @@ pull_request_rules: - check-success=DCO - check-success=CodeFactor - check-success=codespell - - "#approved-reviews-by>=1" - - approved-reviews-by=@longhorn/maintainer - - label=ready-to-merge + - "#approved-reviews-by>=2" + - approved-reviews-by=[@longhorn/maintainer, @longhorn/qa] actions: merge: method: rebase @@ -17,18 +16,4 @@ pull_request_rules: - conflict actions: comment: - message: This pull request is now in conflicts. Could you fix it @{{author}}? 🙏 - -# Comment on the PR to trigger backport. ex: @Mergifyio copy stable/3.1 stable/4.0 -- name: backport patches to stable branch - conditions: - - base=master - actions: - backport: - title: "[BACKPORT][{{ destination_branch }}] {{ title }}" - body: | - This is an automatic backport of pull request #{{number}}. - - {{cherry_pick_error}} - assignees: - - "{{ author }}" \ No newline at end of file + message: This pull request is now in conflict. Could you fix it @{{author}}? 🙏