From 5917e6b138c9a11eff016b94331b108e5ff5170d Mon Sep 17 00:00:00 2001 From: Jirka Borovec Date: Tue, 24 Mar 2020 19:50:55 +0100 Subject: [PATCH] Mergify: configuration update (#1200) * Mergify: configuration update * Update .mergify.yml * Update .mergify.yml * Update .mergify.yml --- .mergify.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .mergify.yml diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 0000000000..803eb5cdbe --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,36 @@ +pull_request_rules: + + - name: Automatic merge on approval + conditions: + - base=master + # number of review approvals + - "#approved-reviews-by>=3" + # no waiting or assigned review + - "#review-requested=0" + # no requested chnages from any reviewer + - "#changes-requested-reviews-by=0" + # this serves as ALL check has to pass as we have actually 27 tests in total + - "#status-success=27" + # this is just in case since we rely on GPU tests (note: redundand to the above) + - status-success=continuous-integration/drone/pr + # this is patter-like, unofrunatly serves as `any(...)` (note: redundand to the above) + - "status-success~=^ci/circleci:" + # no conflict with master branch + - -conflict + # was not closed yet + - -closed + actions: + delete_head_branch: {} + merge: + strict: true # https://doc.mergify.io/merge-action.html#strict-merge + strict_method: rebase + method: squash + comment: + message: Great job! =) + + - name: warn on conflicts + conditions: + - conflict + actions: + comment: + message: This pull request is now in conflict... :(