From ba4a7e49a91dcb3ef945c5a41f458d59c4da5cb2 Mon Sep 17 00:00:00 2001
From: Artem Pelenitsyn <a.pelenitsyn@gmail.com>
Date: Sat, 3 Sep 2022 06:51:47 -0400
Subject: [PATCH] [ mergify ] fix condition of 'merge delay passed' label
(#8448)
* [ mergify ] fix condition of 'merge delay passed' label
Add the same conditions that we apply for the last stage of PR: 2 approvers and merge-me label. Otherwise, we get a lot of old PRs as well as some current ones getting the label prematurely.
---
.github/mergify.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.github/mergify.yml b/.github/mergify.yml
index 0de5133b70..e8f8e0d432 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,7 +1,7 @@
pull_request_rules:
# implementing PR delay logic: apply a label after 2 days of inactivity
- # the label will allow Mergify to merge (see #8442)
+ # the label will allow Mergify to merge (see #8442, #8448)
- actions:
label:
add:
@@ -9,6 +9,8 @@ pull_request_rules:
name: Wait for 2 days before validating merge
conditions:
- updated-at<2 days ago
+ - label=merge me
+ - '#approved-reviews-by>=2'
# rebase+merge strategy
- actions:
--
GitLab