From 239f8d26c9716ed10a4fac4ca17cda10f4575343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 12 Jun 2023 06:41:43 +0200
Subject: [PATCH] mergify: replace bors's merge queue

---
 .github/workflows/update-flake-lock.yml |  2 ++
 .mergify.yml                            | 26 +++++++++++++++----------
 bors.toml                               | 12 ------------
 3 files changed, 18 insertions(+), 22 deletions(-)
 delete mode 100644 bors.toml

diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml
index 785d291..bb4f8d7 100644
--- a/.github/workflows/update-flake-lock.yml
+++ b/.github/workflows/update-flake-lock.yml
@@ -19,3 +19,5 @@ jobs:
         uses: DeterminateSystems/update-flake-lock@v19
         with:
           token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
+          pr-labels: |                  # Labels to be set on the PR
+            merge-queue
diff --git a/.mergify.yml b/.mergify.yml
index ea18fb2..0507bba 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,15 +1,21 @@
-pull_request_rules:
-  - name: automatic merge on CI success
-    conditions:
+queue_rules:
+  - name: default
+    merge_conditions:
       - check-success=Evaluate flake.nix
-      - check-success=package nix-eval-jobs [x86_64-linux]
-      - check-success=devShell default [x86_64-linux]
       - check-success=check treefmt [x86_64-linux]
+      - check-success=devShell default [x86_64-linux]
       - check-success=package default [x86_64-linux]
-      - check-success=tests (ubuntu-latest)
+      - check-success=package nix-eval-jobs [x86_64-linux]
       - check-success=tests (macos-latest)
-      - author=nix-eval-jobs-bot
+      - check-success=tests (ubuntu-latest)
+defaults:
+  actions:
+    queue:
+      allow_merging_configuration_change: true
+pull_request_rules:
+  - name: merge using the merge queue
+    conditions:
+      - base=main
+      - label=merge-queue
     actions:
-      merge:
-        method: merge
-      delete_head_branch: {}
+      queue: {}
diff --git a/bors.toml b/bors.toml
deleted file mode 100644
index 826bb37..0000000
--- a/bors.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-cut_body_after = "" # don't include text from the PR body in the merge commit message
-status = [
-  # garnix
-  "Evaluate flake.nix",
-  "package nix-eval-jobs [x86_64-linux]",
-  "devShell default [x86_64-linux]",
-  "check treefmt [x86_64-linux]",
-  "package default [x86_64-linux]",
-  # github actions
-  "tests (ubuntu-latest)",
-  "tests (macos-latest)"
-]