From e307c0f9dacecc4401064e9c6ddc69e7dbdc3013 Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Wed, 22 Mar 2023 21:29:22 +0100 Subject: [PATCH] ci(mergify): only report conflicts on draft PRs with a milestone This is an evolution of the idea in https://github.com/libp2p/rust-libp2p/pull/3614 that should be closer to what we want. Not sure why I didn't think of this in the first place. Pull-Request: #3660. --- .github/mergify.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/mergify.yml b/.github/mergify.yml index 9948293d..d7eff473 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -14,6 +14,11 @@ pull_request_rules: conditions: - conflict - -author=dependabot[bot] + - or: + - -draft # Don't report conflicts on regular draft. + - and: # Do report conflicts on draft that are scheduled for the next major release. + - draft + - milestone~=v[0-9]\.[0-9]{2} actions: comment: message: This pull request has merge conflicts. Could you please resolve them @{{author}}? 🙏