Merge branch 'main' into john/db-service-nic-explicit-slot

oxidecomputer · Feb 15, 2024 · a032b3e · a032b3e
2 parents 52e8275 + ae39f26
commit a032b3e
Show file tree

Hide file tree

Showing 22 changed files with 1,598 additions and 471 deletions.
diff --git a/.github/buildomat/jobs/package.sh b/.github/buildomat/jobs/package.sh
@@ -37,7 +37,7 @@ rustc --version
 # trampoline global zone images.
 #
 COMMIT=$(git rev-parse HEAD)
-VERSION="6.0.0-0.ci+git${COMMIT:0:11}"
+VERSION="7.0.0-0.ci+git${COMMIT:0:11}"
 echo "$VERSION" >/work/version.txt
 
 ptime -m ./tools/install_builder_prerequisites.sh -yp

diff --git a/.github/workflows/hakari.yml b/.github/workflows/hakari.yml
@@ -24,7 +24,7 @@ jobs:
         with:
           toolchain: stable
       - name: Install cargo-hakari
-        uses: taiki-e/install-action@717ed1cb83959ef327137c2f806e1d8597bfca9f # v2
+        uses: taiki-e/install-action@14422f84f07a2d547893af56258f5e59333262df # v2
         with:
           tool: cargo-hakari
       - name: Check workspace-hack Cargo.toml is up-to-date