From 3c94bd68e939ccc46a038ef4bd127420145491ed Mon Sep 17 00:00:00 2001
From: Daniel Harvey <danieljamesharvey@gmail.com>
Date: Tue, 31 Oct 2023 11:20:39 +0000
Subject: [PATCH] Enable merge groups for merge queue

---
 .github/workflows/cargo-build.yaml | 8 +++++---
 .github/workflows/cargo-test.yaml  | 8 +++++---
 .github/workflows/nix-check.yaml   | 1 +
 .github/workflows/nix-deploy.yaml  | 6 +-----
 .github/workflows/rustfmt.yaml     | 7 +++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/cargo-build.yaml b/.github/workflows/cargo-build.yaml
index d8c4d6d3..beaa7462 100644
--- a/.github/workflows/cargo-build.yaml
+++ b/.github/workflows/cargo-build.yaml
@@ -1,4 +1,6 @@
-on: [push]
+on:
+  push:
+  merge_group:
 
 name: SQLServer NDC build
 
@@ -38,7 +40,7 @@ jobs:
         with:
           status: ${{ job.status }}
           notify_when: failure
-          notification_title: '😧 Error on <{repo_url}|{repo}>'
-          message_format: '🐴 *{workflow}* {status_message} for <{repo_url}|{repo}>'
+          notification_title: "😧 Error on <{repo_url}|{repo}>"
+          message_format: "🐴 *{workflow}* {status_message} for <{repo_url}|{repo}>"
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.BROKEN_BUILD_SLACK_WEBHOOK_URL }}
diff --git a/.github/workflows/cargo-test.yaml b/.github/workflows/cargo-test.yaml
index e1c26768..7559858c 100644
--- a/.github/workflows/cargo-test.yaml
+++ b/.github/workflows/cargo-test.yaml
@@ -1,4 +1,6 @@
-on: [push]
+on:
+  push:
+  merge_group:
 
 name: SQLServer NDC tests
 
@@ -48,7 +50,7 @@ jobs:
         with:
           status: ${{ job.status }}
           notify_when: failure
-          notification_title: '😧 Error on <{repo_url}|{repo}>'
-          message_format: '🐴 *{workflow}* {status_message} for <{repo_url}|{repo}>'
+          notification_title: "😧 Error on <{repo_url}|{repo}>"
+          message_format: "🐴 *{workflow}* {status_message} for <{repo_url}|{repo}>"
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.BROKEN_BUILD_SLACK_WEBHOOK_URL }}
diff --git a/.github/workflows/nix-check.yaml b/.github/workflows/nix-check.yaml
index 5f84bd38..72a1771f 100644
--- a/.github/workflows/nix-check.yaml
+++ b/.github/workflows/nix-check.yaml
@@ -2,6 +2,7 @@ name: nix check
 
 on:
   push:
+  merge_group:
 
 jobs:
   nix-develop:
diff --git a/.github/workflows/nix-deploy.yaml b/.github/workflows/nix-deploy.yaml
index 48dde205..8dbc1295 100644
--- a/.github/workflows/nix-deploy.yaml
+++ b/.github/workflows/nix-deploy.yaml
@@ -2,11 +2,7 @@ name: multi-architecture docker build
 
 on:
   push:
-    branches:
-      - main
-      - djh/multi-arch-build
-    tags:
-      - "v*"
+  merge_group:
 
 jobs:
   build_and_deploy:
diff --git a/.github/workflows/rustfmt.yaml b/.github/workflows/rustfmt.yaml
index e89c64c6..b59ae0e0 100644
--- a/.github/workflows/rustfmt.yaml
+++ b/.github/workflows/rustfmt.yaml
@@ -2,6 +2,7 @@ name: SQLServer NDC check formatting with Rustfmt
 
 on:
   push:
+  merge_group:
 
 jobs:
   formatting:
@@ -27,9 +28,7 @@ jobs:
         with:
           status: ${{ job.status }}
           notify_when: failure
-          notification_title: '😧 Error on <{repo_url}|{repo}>'
-          message_format: '🐴 *{workflow}* {status_message} for <{repo_url}|{repo}>'
+          notification_title: "😧 Error on <{repo_url}|{repo}>"
+          message_format: "🐴 *{workflow}* {status_message} for <{repo_url}|{repo}>"
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.BROKEN_BUILD_SLACK_WEBHOOK_URL }}
-
-