From 5c87f0f331a173595523598e709086b3f3473709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Mon, 9 Nov 2020 14:01:43 +0100 Subject: [PATCH] bot: add rule to auto-merge on no code changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On pull request with no code changes, the canary and integration tests won't run. This means they won't appear in the status and mergify cannot validate them. Signed-off-by: Sébastien Han --- .mergify.yml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index 766a5842b..f27889b90 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -18,7 +18,7 @@ pull_request_rules: message: This pull request has merge conflicts that must be resolved before it can be merged. @{{author}} please rebase it. https://rook.io/docs/rook/master/development-flow.html#updating-your-fork # automerge on master only under certain strict conditions - - name: automerge merge master with specific label and approvals + - name: automerge merge master with specific label and approvals with code change conditions: - author=mergify[bot] - base=master @@ -48,6 +48,25 @@ pull_request_rules: dismiss_reviews: {} delete_head_branch: {} + - name: automerge merge master with specific label and approvals without code change + conditions: + - author=mergify[bot] + - base=master + - "#approved-reviews-by>=1" + - "#changes-requested-reviews-by=0" + - label!=do-not-merge + - label=ready-to-merge + - 'check-success=lint' + - 'check-success=DCO' + - 'check-success=continuous-integration/jenkins/pr-head' + - 'check-success=build' + actions: + merge: + method: merge + strict: false + dismiss_reviews: {} + delete_head_branch: {} + # automerge backports if CI successfully ran # release-1.3 branch - name: automerge backport release-1.3