Merge branch 'main' into gil/cli-jsonschema

hasura · Mar 12, 2024 · ebfd25c · ebfd25c
2 parents e97fd6d + 5e4026b
commit ebfd25c
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 33 deletions.
diff --git a/.github/workflows/benchmarks.yaml b/.github/workflows/benchmarks.yaml
@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Nix ❄
-        uses: cachix/install-nix-action@v25
+        uses: cachix/install-nix-action@v26
         with:
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/.github/workflows/check-format.yaml b/.github/workflows/check-format.yaml
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Nix ❄
-        uses: cachix/install-nix-action@v25
+        uses: cachix/install-nix-action@v26
         with:
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -61,7 +61,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Nix ❄
-        uses: cachix/install-nix-action@v25
+        uses: cachix/install-nix-action@v26
         with:
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
@@ -12,17 +12,17 @@ jobs:
 
     steps:
       - name: Install `just`
-        uses: extractions/setup-just@v1
+        uses: extractions/setup-just@v2
 
       - name: Log in to GitHub Container Registry 📦
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Check out ndc-postgres
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: ndc-postgres
 
@@ -31,7 +31,7 @@ jobs:
         working-directory: ndc-postgres
 
       - name: Check out v3-engine
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: hasura/v3-engine
           path: v3-engine
@@ -42,7 +42,7 @@ jobs:
         working-directory: v3-engine
 
       - name: Check out v3-e2e-testing
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: hasura/v3-e2e-testing
           path: v3-e2e-testing
@@ -54,7 +54,7 @@ jobs:
 
       - name: Upload logs
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: logs
           path: v3-e2e-testing/crates/postgres/static/logs
diff --git a/.github/workflows/nix-check.yaml b/.github/workflows/nix-check.yaml
@@ -12,7 +12,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Nix ❄
-        uses: cachix/install-nix-action@v25
+        uses: cachix/install-nix-action@v26
         with:
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -34,7 +34,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Nix ❄
-        uses: cachix/install-nix-action@v25
+        uses: cachix/install-nix-action@v26
         with:
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/.github/workflows/ship.yaml b/.github/workflows/ship.yaml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Nix ❄
-        uses: cachix/install-nix-action@v25
+        uses: cachix/install-nix-action@v26
         with:
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -63,7 +63,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Nix ❄
-        uses: cachix/install-nix-action@v25
+        uses: cachix/install-nix-action@v26
         with:
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -11,7 +11,7 @@ workspace = true
 ndc-postgres-configuration = { path = "../configuration" }
 
 anyhow = "1.0.80"
-clap = { version = "4.5.1", features = ["derive", "env"] }
+clap = { version = "4.5.2", features = ["derive", "env"] }
 schemars = { version = "0.8.16", features = ["smol_str", "preserve_order"] }
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = { version = "1.0.114", features = ["raw_value"] }

diff --git a/crates/tests/tests-common/Cargo.toml b/crates/tests/tests-common/Cargo.toml
@@ -22,10 +22,10 @@ ndc-test = { git = "https://github.com/hasura/ndc-spec.git", tag = "v0.1.0" }
 anyhow = "1.0.80"
 axum = "0.6.20"
 axum-test-helper = "0.3.0"
-env_logger = "0.11.1"
+env_logger = "0.11.3"
 hyper = { version = "0.14.28", features = ["tcp"] }
 jsonschema = { version = "0.17.1", default-features = false, features = ["resolve-http"] }
-reqwest = "0.11.24"
+reqwest = "0.11.25"
 schemars = { version = "0.8.16", features = ["smol_str", "preserve_order"] }
 serde = "1.0.197"
 serde_json = { version = "1.0.114", features = ["raw_value"] }