Merge branch 'main' into ixi/boot-order

also update propolis to the matching version now that #756 is merged

Author: iximeow

.cargo/xtask.toml

@@ -13,6 +13,7 @@
 [libraries."libgcc_s.so.1"]
 [libraries."libipcc.so.1"]
 [libraries."libkstat.so.1"]
+[libraries."liblzma.so.5"]
 [libraries."libm.so.2"]
 [libraries."libnsl.so.1"]
 [libraries."libnvpair.so.1"]

.github/buildomat/jobs/omicron-common.sh

@@ -21,5 +21,16 @@ cd /tmp
 cargo new --lib test-project
 cd test-project
 cargo add omicron-common --path /work/oxidecomputer/omicron/common
+# Bootstrap `test-project`'s dependencies from the checked-in Cargo.lock.
+# This means that `test-project` builds with the same commits as the main repo
+# for any dependencies referenced as `{ git = "...", ref = "<branch>" }`. If we
+# do not prepopulate `Cargo.lock` like this, an update in a dependency might get
+# picked up here and be incompatible with `omicron-common`, causing it to fail
+# to build (see Omicron issue #6691).
+#
+# The extra dependencies in `omicron` will get pruned by Cargo when it
+# recalculates dependencies, but any dependencies that match will stay at the
+# commit/version/etc already indicated in the lockfile.
+cp /work/oxidecomputer/omicron/Cargo.lock Cargo.lock
 cargo check
 cargo build --release