Merge branch 'main' into john/blueprint-store-sled-state

oxidecomputer · May 10, 2024 · d3e2c1a · d3e2c1a
2 parents f1ce720 + 13163d1
commit d3e2c1a
Show file tree

Hide file tree

Showing 120 changed files with 671 additions and 172 deletions.
diff --git a/.github/buildomat/jobs/host-image.sh b/.github/buildomat/jobs/host-image.sh
@@ -49,7 +49,6 @@ source "$TOP/tools/include/force-git-over-https.sh"
 HELIOSDIR=/work/helios
 git clone https://github.com/oxidecomputer/helios.git "$HELIOSDIR"
 cd "$HELIOSDIR"
-git checkout pin-amd-host-image-builder
 # Record the branch and commit in the output
 git status --branch --porcelain=2
 # Setting BUILD_OS to no makes setup skip repositories we don't need for

diff --git a/.github/workflows/hakari.yml b/.github/workflows/hakari.yml
@@ -17,14 +17,14 @@ jobs:
     env:
       RUSTFLAGS: -D warnings
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4
         with:
           ref: ${{ github.event.pull_request.head.sha }} # see omicron#4461
       - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1
         with:
           toolchain: stable
       - name: Install cargo-hakari
-        uses: taiki-e/install-action@00a67321d66e038602baf558d366a594a7019ea2 # v2
+        uses: taiki-e/install-action@33429073072b7cebf2bbb9807209561b3d1decf7 # v2
         with:
           tool: cargo-hakari
       - name: Check workspace-hack Cargo.toml is up-to-date