Merge branch 'main' into djh/NDAT-821/service-name-as-input

hasura · Sep 12, 2023 · fbf18c2 · fbf18c2
2 parents 6684dbf + 17826f9
commit fbf18c2
Show file tree

Hide file tree

Showing 16 changed files with 459 additions and 175 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source_env_if_exists ./.envrc.local
diff --git a/.envrc.local b/.envrc.local
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+use flake
+
+source_env ../.envrc
diff --git a/.github/workflows/nix.yaml b/.github/workflows/nix.yaml
@@ -0,0 +1,20 @@
+name: test Nix support
+
+on: push
+
+jobs:
+  evaluate-nix-shell:
+    name: Evaluate the Nix shell
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v3
+
+      - name: Install Nix ❄
+        uses: DeterminateSystems/nix-installer-action@v4
+
+      - name: Run the Magic Nix Cache 🔌
+        uses: DeterminateSystems/magic-nix-cache-action@v2
+
+      - name: Evaluate the Nix shell
+        run: nix develop -c "true"
diff --git a/.gitignore b/.gitignore
@@ -1 +1,5 @@
+# Rust
 /target
+
+# direnv
+/.direnv
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
   "rust-connector-sdk",
 ]
@@ -7,4 +8,4 @@ members = [
 debug = true
 
 [profile.bench]
-debug = true
+debug = true
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.68.2-slim-buster AS build
+FROM rust:1.70.0-slim-buster AS build
 
 WORKDIR app
 

diff --git a/flake.lock b/flake.lock