From 4c7dadd594e6a6497ffa4311e47dc434fe62a720 Mon Sep 17 00:00:00 2001
From: arfy slowy <slowy.arfy@proton.me>
Date: Fri, 26 Jul 2024 08:23:05 +0700
Subject: [PATCH] ci(Mergify): configuration update (#853)

Signed-off-by: arfy slowy <null>
---
 .mergify.yml | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index e0b135d415..1755e3e445 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,17 +1,30 @@
 pull_request_rules:
-  - name: auto merge ready
+  - name: CI automerge when passing all test
     conditions:
-      - base=master
       - label=ready-to-merge
-      - check-success=Testing Leafmap Package
       - check-success=CodeQL
-      - check-success=Testing Leafmap Package (windows)
-      - '#approved-reviews-by>=1'
+      - check-success=test-ubuntu (3.9)
+      - check-success=test-ubuntu (3.10)
+      - check-success=test-ubuntu (3.11)
+      - check-success=test-ubuntu (3.12)
+      - check-success=test-windows (3.11)
+      - "#approved-reviews-by>=1"
+      - base=master
     actions:
       comment:
-        message: thanks for the contribution @{{author}}!
+        message: thanks for the contribution @{{author}} 🤩
       label:
         add:
-          - reviewed !
+          - already reviewed
       merge:
         method: squash
+
+  - name: information about conflicts pull request
+    conditions:
+      - conflict
+    actions:
+      comment:
+        message: your pull request are conflict @{{author}}, please fix it !
+      label:
+        add:
+          - conflicts pull request