Merge pull request #51 from hasura/djh/add-merge-groups

Enable merge groups for merge queue

.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 }}

.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 }}

.github/workflows/nix-check.yaml

@@ -2,6 +2,7 @@ name: nix check
 
 on:
   push:
+  merge_group:
 
 jobs:
   nix-develop:

.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:

.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 }}
-
-

Cargo.toml

@@ -7,3 +7,12 @@ members = [
   "crates/ndc-sqlserver",
   "crates/query-engine",
 ]
+
+
+# Temporary patch to get the build working. We shall remove this once a new
+# version of ndc-spec is published, and ndc-sdk is updated accordingly.
+# The "//" is to convince Cargo to accept this, due to
+# https://github.com/rust-lang/cargo/issues/10756 .
+[patch."https://github.com/hasura/ndc-spec.git"]
+ndc-client = { git = "https://github.com/hasura//ndc-spec.git", rev = "3778605" }
+ndc-test = { git = "https://github.com/hasura//ndc-spec.git", rev = "3778605" }

flake.nix

@@ -8,8 +8,6 @@
     crane = {
       url = "github:ipetkov/crane";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.rust-overlay.follows = "rust-overlay";
-      inputs.flake-utils.follows = "flake-utils";
     };
 
     rust-overlay = {