ci(shared): bump vendored ci files

GaloyMoney · Apr 29, 2024 · 7497fef · 7497fef
1 parent 33a2743
commit 7497fef
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/.github/workflows/check-code.yml b/.github/workflows/check-code.yml
@@ -12,6 +12,11 @@ jobs:
     name: Check Code
     runs-on: ubuntu-latest
     steps:
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@v4
+      - name: Run the Magic Nix Cache
+        uses: DeterminateSystems/magic-nix-cache-action@v2
       - uses: actions/checkout@v3
       - name: Run check code
         run: make check-code
+        run: nix develop -c make check-code
diff --git a/.github/workflows/vendor/rust-check-code.yml b/.github/workflows/vendor/rust-check-code.yml
@@ -12,6 +12,11 @@ jobs:
     name: Check Code
     runs-on: ubuntu-latest
     steps:
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@v4
+      - name: Run the Magic Nix Cache
+        uses: DeterminateSystems/magic-nix-cache-action@v2
       - uses: actions/checkout@v3
       - name: Run check code
         run: make check-code
+        run: nix develop -c make check-code
diff --git a/ci/vendir.lock.yml b/ci/vendir.lock.yml
@@ -2,14 +2,14 @@ apiVersion: vendir.k14s.io/v1alpha1
 directories:
 - contents:
   - git:
-      commitTitle: 'chore: use kaniko builder in shared build task (#50)'
-      sha: 3d1a7c11c7967952e84231e39aa5425ad704d93d
+      commitTitle: 'chore: use nix for rust check-code (#52)'
+      sha: a14ab78128be32e6e1d37f21def9a83351531bde
     path: .
   path: ../.github/workflows/vendor
 - contents:
   - git:
-      commitTitle: 'chore: use kaniko builder in shared build task (#50)'
-      sha: 3d1a7c11c7967952e84231e39aa5425ad704d93d
+      commitTitle: 'chore: use nix for rust check-code (#52)'
+      sha: a14ab78128be32e6e1d37f21def9a83351531bde
     path: .
-  path: ./vendor
+  path: vendor
 kind: LockConfig
diff --git a/ci/vendir.yml b/ci/vendir.yml
@@ -8,7 +8,7 @@ directories:
   - path: . # Copy this folder out to ..
     git:
       url: https://github.com/GaloyMoney/concourse-shared.git
-      ref: 3d1a7c11c7967952e84231e39aa5425ad704d93d
+      ref: a14ab78128be32e6e1d37f21def9a83351531bde
     includePaths:
     - shared/actions/*
     excludePaths:
@@ -20,7 +20,7 @@ directories:
   - path: .
     git:
       url: https://github.com/GaloyMoney/concourse-shared.git
-      ref: 3d1a7c11c7967952e84231e39aa5425ad704d93d
+      ref: a14ab78128be32e6e1d37f21def9a83351531bde
     includePaths:
     - shared/ci/**/*
     excludePaths:

diff --git a/ci/vendor/tasks/rust-check-code.sh b/ci/vendor/tasks/rust-check-code.sh
@@ -7,4 +7,4 @@ set -eu
 
 pushd repo
 
-make check-code
+nix develop -c make check-code
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,4 @@ set -eu

		pushd repo

		make check-code
		nix develop -c make check-code