From e1ff2831dc2eabff2e70f302aaed81094a8b3353 Mon Sep 17 00:00:00 2001
From: Sergey Yakovlev <selfuryon@pm.me>
Date: Wed, 30 Oct 2024 22:49:08 +0200
Subject: [PATCH] chore(ci): rework mergify configuration

---
 .github/mergify.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index dbc63d44..015fca5f 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,12 +1,14 @@
-defaults:
-  actions:
-    queue:
-      allow_merging_configuration_change: true
-
 queue_rules:
   - name: default
     conditions:
-      - check-success=buildbot/nix-eval
+      - "check-success=buildbot/nix-build"
+    batch_size: 1
+    batch_max_wait_time: "15 minutes"
+    merge_method: squash
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+      
+      {{ body }}
 
 pull_request_rules:
   - name: Automerge PRs using the merge queue
@@ -16,10 +18,12 @@ pull_request_rules:
     actions:
       queue:
         name: default
-        method: squash
+      delete_head_branch:
+        force: true
 
   - name: Delete head branch after merge
     conditions:
+      - "closed"
       - "merged"
     actions:
       delete_head_branch: {}