merge main into branch

oxidecomputer · Feb 21, 2024 · 2888060 · 2888060
2 parents 5303386 + 6993b41
commit 2888060
Show file tree

Hide file tree

Showing 41 changed files with 2,090 additions and 457 deletions.
diff --git a/.github/buildomat/jobs/package.sh b/.github/buildomat/jobs/package.sh
@@ -111,8 +111,8 @@ zones=(
   out/clickhouse.tar.gz
   out/clickhouse_keeper.tar.gz
   out/cockroachdb.tar.gz
-  out/crucible-pantry.tar.gz
-  out/crucible.tar.gz
+  out/crucible-pantry-zone.tar.gz
+  out/crucible-zone.tar.gz
   out/external-dns.tar.gz
   out/internal-dns.tar.gz
   out/omicron-nexus.tar.gz

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@6943331e01261cdff7420bbc2508cb463574e404 # v2
+        uses: taiki-e/install-action@12af778b97addf4c562c75a0564dc7e7dc5339a5 # v2
         with:
           tool: cargo-hakari
       - name: Check workspace-hack Cargo.toml is up-to-date