From a553157b15e33f73b1c71b63be18f0474e757091 Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@redhat.com>
Date: Tue, 11 Jan 2022 19:41:51 +0100
Subject: [PATCH] ci: don't dismiss review if PR has not merged

Pull requests are not going to be queued if at the same time the pull
request review are dismiss

Original-author: Mehdi ABAAKOUK <sileht@sileht.net>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
---
 .mergify.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index f91432887..2ef06351d 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -107,8 +107,15 @@ pull_request_rules:
     actions:
       queue:
         name: default
-      dismiss_reviews: {}
       delete_head_branch: {}
+
+  - name: dismiss review of merged pull request
+    conditions:
+      - base~=^(devel)|(release-.+)$
+      - merged
+    actions:
+      dismiss_reviews: {}
+
   - name: automatic merge
     conditions:
       - label!=DNM
@@ -139,8 +146,8 @@ pull_request_rules:
     actions:
       queue:
         name: default
-      dismiss_reviews: {}
       delete_head_branch: {}
+
   - name: automatic merge PR having ready-to-merge label
     conditions:
       - label!=DNM
@@ -170,7 +177,6 @@ pull_request_rules:
     actions:
       queue:
         name: default
-      dismiss_reviews: {}
       delete_head_branch: {}
   - name: backport patches to release-v3.5 branch
     conditions:
@@ -249,7 +255,6 @@ pull_request_rules:
     actions:
       queue:
         name: default
-      dismiss_reviews: {}
       delete_head_branch: {}
   - name: remove outdated approvals on ci/centos
     conditions:
@@ -272,7 +277,6 @@ pull_request_rules:
     actions:
       queue:
         name: default
-      dismiss_reviews: {}
       delete_head_branch: {}
   - name: automatic merge PR having ready-to-merge label on ci/centos
     conditions:
@@ -287,7 +291,6 @@ pull_request_rules:
     actions:
       queue:
         name: default
-      dismiss_reviews: {}
       delete_head_branch: {}
   ##
   ## Automatically set/remove labels