From f1d543cbf051dae36f85a1c474e8194e9cbe9cc1 Mon Sep 17 00:00:00 2001 From: Yang Chiu Date: Thu, 15 Feb 2024 10:34:06 +0800 Subject: [PATCH 1/2] Revert "Update mergify.yml" This reverts commit 8b4dce86baa56beb041f4d52c995c326bf0e2971. Signed-off-by: Yang Chiu --- .github/mergify.yml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 391743c6ed..2dd1aee601 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -5,8 +5,9 @@ pull_request_rules: - check-success=DCO - check-success=CodeFactor - check-success=codespell - - "#approved-reviews-by>=2" - - approved-reviews-by=[@longhorn/maintainer, @longhorn/qa] + - "#approved-reviews-by>=1" + - approved-reviews-by=@longhorn/maintainer + - label=ready-to-merge actions: merge: method: rebase @@ -16,4 +17,18 @@ pull_request_rules: - conflict actions: comment: - message: This pull request is now in conflict. Could you fix it @{{author}}? 🙏 + 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 From e244889bb0bc8a114816b310f38f1129e45e23c2 Mon Sep 17 00:00:00 2001 From: David Ko Date: Thu, 15 Feb 2024 10:57:33 +0800 Subject: [PATCH 2/2] Update mergify.yml --- .github/mergify.yml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 2dd1aee601..0da48caa09 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>=2" - approved-reviews-by=@longhorn/maintainer - - label=ready-to-merge 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}}? 🙏