From 0971a0871fb1b030df91aa279e54e962b5cfd379 Mon Sep 17 00:00:00 2001
From: Artem Pelenitsyn <a.pelenitsyn@gmail.com>
Date: Wed, 31 Aug 2022 09:52:19 -0400
Subject: [PATCH] [ mergify ] better implementation of 2 day delay (fix #8442)

---
 .github/mergify.yml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 39db63b5d42..534b103d5e3 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,4 +1,15 @@
 pull_request_rules:
+
+  # implementing PR delay logic: apply a label after 2 days of inactivity
+  # the label will allow Mergify to merge (see #8442)
+  - actions:
+      label:
+        add:
+          - merge delay passed
+    name: Wait for 2 days before validating merge
+    conditions:
+      - updated-at<2 days ago
+
   # rebase+merge strategy
   - actions:
       queue:
@@ -11,8 +22,9 @@ pull_request_rules:
     conditions:
       - base=master
       - label=merge me
+      - label=merge delay passed
       - '#approved-reviews-by>=2'
-      - updated-at<2 days ago
+
   # merge+squash strategy
   - actions:
       queue:
@@ -25,9 +37,10 @@ pull_request_rules:
     conditions:
       - base=master
       - label=squash+merge me
+      - label=merge delay passed
       - '#approved-reviews-by>=2'
-      - updated-at<2 days ago
-  # rebase+merge strategy for backports: require 1 approver instead of 2
+
+# rebase+merge strategy for backports: require 1 approver instead of 2
   - actions:
       queue:
         name: default