Skip to content

Commit 102b0bb

Browse files
authored
update omicron-common and other dependencies (#1778)
In order to make Crucible APIs versioned, we need to pull in a definition recently added to omicron-common: [`omicron_common::api::VERSION_HEADER`](https://github.com/oxidecomputer/omicron/blame/4d5bdc6d348b27761348d763c4085f060bcefc18/common/src/api/mod.rs#L10-L12). This ended up being a pretty large yak shave: * had to update Rust version * then, had to fix up all the new lint warnings
1 parent 5a4a15c commit 102b0bb

File tree

37 files changed

+2659
-1660
lines changed

37 files changed

+2659
-1660
lines changed

.cargo/config.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ xtask = "run --package xtask --"
66
#
77
# Once https://github.com/rust-lang/cargo/issues/12115 makes it to our
88
# toolchain, we'll be able to put this in the `Cargo.toml` manifest instead.
9-
rustflags = ["-Wclippy::unused-async"]
9+
#
10+
# Also enable the `tokio-unstable` config for `tokio-dtrace` probes.
11+
rustflags = ["-Wclippy::unused-async", "--cfg", "tokio_unstable"]

.github/buildomat/jobs/build-release.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ pfexec coreadm -i /tmp/core.%f.%p \
6767
-e log \
6868
-e proc-setid \
6969
-e global-setid
70+
71+
banner prerequisites
72+
ptime -m ./tools/install_builder_prerequisites.sh -y
7073

7174
banner rbuild
7275
ptime -m cargo build --verbose --release --all-features

.github/buildomat/jobs/build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ pfexec coreadm -i /tmp/core.%f.%p \
2727
-e proc-setid \
2828
-e global-setid
2929

30+
banner prerequisites
31+
ptime -m ./tools/install_builder_prerequisites.sh -y
32+
3033
banner build
3134
ptime -m cargo build --verbose --all-features
3235

0 commit comments

Comments
 (0)