From f2c0ad40c8c227fd703b0cd8a64523ad78d37990 Mon Sep 17 00:00:00 2001
From: Yvan Sraka <yvan@sraka.xyz>
Date: Tue, 21 Oct 2025 10:59:47 +0200
Subject: [PATCH] feat: enable GitHub merge queues

---
 .github/workflows/check-shellscripts.yml | 8 +++-----
 .github/workflows/ci.yml                 | 1 +
 .github/workflows/nix-build.yml          | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/check-shellscripts.yml b/.github/workflows/check-shellscripts.yml
index 9d1389e9e..1a7e4db2c 100644
--- a/.github/workflows/check-shellscripts.yml
+++ b/.github/workflows/check-shellscripts.yml
@@ -1,15 +1,13 @@
 name: Check shell scripts
 
 on:
-  push:
-    branches:
-      - develop
   pull_request:
+  merge_group:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.merge_group.head_ref || github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
 
 permissions:
   contents: read
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 12abc8e91..602268a13 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,6 +2,7 @@ name: Check merge requirements
 
 on:
   pull_request:
+  merge_group:
 
 permissions:
   contents: read
diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml
index 758b9fbbd..818c5b50e 100644
--- a/.github/workflows/nix-build.yml
+++ b/.github/workflows/nix-build.yml
@@ -3,9 +3,9 @@ name: Nix CI
 on:
   push:
     branches:
-      - develop
       - release/*
   pull_request:
+  merge_group:
   workflow_dispatch:
 
 permissions: