Merge branch 'main' into eliza/instance-watch-rpw

; Conflicts: ; dev-tools/omdb/src/bin/omdb/nexus.rs ; nexus-config/src/nexus_config.rs ; nexus/examples/config.toml ; nexus/src/app/background/init.rs ; nexus/tests/config.test.toml ; smf/nexus/multi-sled/config-partial.toml ; smf/nexus/single-sled/config-partial.toml
oxidecomputer · May 6, 2024 · b1ec6e1 · b1ec6e1
2 parents c1661e9 + 371a813
commit b1ec6e1
Show file tree

Hide file tree

Showing 132 changed files with 7,428 additions and 1,275 deletions.
diff --git a/.github/buildomat/jobs/host-image.sh b/.github/buildomat/jobs/host-image.sh
@@ -49,6 +49,7 @@ 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