Enable merge groups for merge queue

hasura · Oct 31, 2023 · 3c94bd6 · 3c94bd6
1 parent 2050264
commit 3c94bd6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 }}
-
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ name: nix check @@
     on:
       push:
+      merge_group:
     jobs:
       nix-develop:
@@ Expand Down @@