From d29d95b8eb1fdac1cfba830e81b5135a5de2d82e Mon Sep 17 00:00:00 2001
From: Stas Shevchenko <sshevchenko@evolution.com>
Date: Thu, 3 Sep 2026 21:40:42 +0200
Subject: [PATCH 1/4] Add Mergify config

---
 .mergify.yml | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 .mergify.yml

diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 0000000..a818dd6
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,47 @@
+queue_rules:
+  - name: default
+    merge_method: rebase
+    update_method: rebase
+    merge_conditions:
+      - check-success=test / formatting
+      - check-success=test / sbt-tasks
+      - check-success=test / test-coverage (2.13.18)
+      - check-success=test / test-coverage (3.3.8)
+      - check-success=test / binary-compatibility (2.13.18)
+      - check-success=test / binary-compatibility (3.3.8)
+      - check-success=test / scaladoc (2.13.18)
+      - check-success=test / scaladoc (3.3.8)
+      - check-success=test / coverage-finished
+
+pull_request_rules:
+  - name: queue approved pull requests
+    conditions:
+      - base=master
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
+      - label!=do-not-merge
+    actions:
+      queue:
+
+  - name: queue scala-steward updates
+    conditions:
+      - base=master
+      - author=scala-steward
+      - label!=do-not-merge
+    actions:
+      queue:
+
+  - name: rebase stale pull requests
+    conditions:
+      - base=master
+      - -conflict
+      - "#commits-behind>0"
+    actions:
+      update:
+        method: rebase
+
+  - name: delete head branch after merge
+    conditions:
+      - merged
+    actions:
+      delete_head_branch:

From 7684598371939c464ea3ef6241652fa19bbb2d5a Mon Sep 17 00:00:00 2001
From: Stas Shevchenko <sshevchenko@evolution.com>
Date: Fri, 4 Sep 2026 12:08:53 +0200
Subject: [PATCH 2/4] Match CI checks by regex, drop branch delete rule

---
 .mergify.yml | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index a818dd6..1a9b2ef 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -3,15 +3,9 @@ queue_rules:
     merge_method: rebase
     update_method: rebase
     merge_conditions:
-      - check-success=test / formatting
-      - check-success=test / sbt-tasks
-      - check-success=test / test-coverage (2.13.18)
-      - check-success=test / test-coverage (3.3.8)
-      - check-success=test / binary-compatibility (2.13.18)
-      - check-success=test / binary-compatibility (3.3.8)
-      - check-success=test / scaladoc (2.13.18)
-      - check-success=test / scaladoc (3.3.8)
-      - check-success=test / coverage-finished
+      - check-success~=^test /
+      - -check-pending~=^test /
+      - -check-failure~=^test /
 
 pull_request_rules:
   - name: queue approved pull requests
@@ -40,8 +34,3 @@ pull_request_rules:
       update:
         method: rebase
 
-  - name: delete head branch after merge
-    conditions:
-      - merged
-    actions:
-      delete_head_branch:

From 8c25c96c7bad1a6cc0080b55a3572763392b7d83 Mon Sep 17 00:00:00 2001
From: Stas Shevchenko <sshevchenko@evolution.com>
Date: Fri, 4 Sep 2026 12:27:46 +0200
Subject: [PATCH 3/4] Fix invalid update action, gate on required checks

---
 .mergify.yml | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 1a9b2ef..5ba43ff 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,11 +1,19 @@
+shared:
+  ci_passed: &ci_passed
+    - check-success~=^test /
+    - -check-pending~=^test /
+    - -check-failure~=^test /
+    - check-success=AI Policy Check
+
+merge_queue:
+  max_parallel_checks: 1
+
 queue_rules:
   - name: default
     merge_method: rebase
     update_method: rebase
-    merge_conditions:
-      - check-success~=^test /
-      - -check-pending~=^test /
-      - -check-failure~=^test /
+    queue_conditions: *ci_passed
+    merge_conditions: *ci_passed
 
 pull_request_rules:
   - name: queue approved pull requests
@@ -24,13 +32,3 @@ pull_request_rules:
       - label!=do-not-merge
     actions:
       queue:
-
-  - name: rebase stale pull requests
-    conditions:
-      - base=master
-      - -conflict
-      - "#commits-behind>0"
-    actions:
-      update:
-        method: rebase
-

From 023068b4230fa3988d490b10bbc477898255fb27 Mon Sep 17 00:00:00 2001
From: Stas Shevchenko <sshevchenko@evolution.com>
Date: Fri, 4 Sep 2026 12:49:59 +0200
Subject: [PATCH 4/4] Extend shared Mergify config

---
 .mergify.yml | 35 +----------------------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 5ba43ff..1050356 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,34 +1 @@
-shared:
-  ci_passed: &ci_passed
-    - check-success~=^test /
-    - -check-pending~=^test /
-    - -check-failure~=^test /
-    - check-success=AI Policy Check
-
-merge_queue:
-  max_parallel_checks: 1
-
-queue_rules:
-  - name: default
-    merge_method: rebase
-    update_method: rebase
-    queue_conditions: *ci_passed
-    merge_conditions: *ci_passed
-
-pull_request_rules:
-  - name: queue approved pull requests
-    conditions:
-      - base=master
-      - "#approved-reviews-by>=1"
-      - "#changes-requested-reviews-by=0"
-      - label!=do-not-merge
-    actions:
-      queue:
-
-  - name: queue scala-steward updates
-    conditions:
-      - base=master
-      - author=scala-steward
-      - label!=do-not-merge
-    actions:
-      queue:
+extends: scala-github-actions