From 41de2a6fb19b8ab9386e73a4f2d72c1c42c97a9b Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Thu, 15 Jul 2021 12:01:55 +0800
Subject: [PATCH] Update mergify.yml for related issue (#6535)

Signed-off-by: quicksilver <zhifeng.zhang@zilliz.com>
---
 .github/mergify.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 6bdb17506e..30450f864b 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -88,16 +88,23 @@ pull_request_rules:
   - name: Blocking PR if missing a related issue
     conditions:
       - base=master
-      - "-body~=issue: #[0-9]{1,4}"
+      - "-body~= #[0-9]{1,6}"
+      - "body~=(?!close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved) #[0-9]{1,6}"
     actions:
       label:
         add:
           - do-not-merge/missing-related-issue
+      comment:
+        message: |
+          @{{author}} Please associate the related issue to the body of your Pull Request.  (eg. “issue: #5”)
+          Make sure you don't include linking PR to issue [keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) in your pull request.
+
 
   - name: Dismiss block label if related issue be added into PR
     conditions:
       - base=master
-      - "body~=issue: #[0-9]{1,4}"
+      - "body~= #[0-9]{1,6}"
+      - "-body~=(?!close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved) #[0-9]{1,6}"
     actions:
       label:
         remove: