From 578716e629f07ccfe4100167d0d1bec3108c6d88 Mon Sep 17 00:00:00 2001 From: Patrick Roy Date: Thu, 31 Jul 2025 07:56:40 +0100 Subject: [PATCH 1/2] Revert "Install lsof into container" This reverts commit 260df6ec5ecbe3a05c3625898ec35d678065cf79. The test in vmm-sys-util that wished to use this ended up not needing it, so remove it again to keep the docker container tidy. Signed-off-by: Patrick Roy --- build_container.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/build_container.sh b/build_container.sh index 625cf7f..a8c9915 100755 --- a/build_container.sh +++ b/build_container.sh @@ -22,7 +22,6 @@ DEBIAN_FRONTEND="noninteractive" apt-get install --no-install-recommends -y \ libglm-dev libstb-dev libc6-dev \ debhelper-compat libdbus-1-dev libglib2.0-dev meson ninja-build dbus \ libvirglrenderer1 libvirglrenderer-dev pipewire libpipewire-0.3-dev \ - lsof \ podman # `riscv64` specific dependencies From 0c7b1470bfa032857948ac5796ee108c2f38abb7 Mon Sep 17 00:00:00 2001 From: Patrick Roy Date: Thu, 31 Jul 2025 07:48:36 +0100 Subject: [PATCH 2/2] install rustup targets for MacOS and Windows Some of the rust-vmm crates (such as vmm-sys-util and vm-memory) have somewhat rudimentary support for MacOS and Windows. While our CI does not have the means to test these platforms (the rust-vmm CI runners are linux-only), it can at least do some simple compile testing using `cargo check` (as long as we do not have any build dependencies that try to compile native libraries). For this, install the required cargo targets into the docker container, such that crates that wish to do such compile testing can specify such additional tests in their custom tests pipelines. Signed-off-by: Patrick Roy --- build_container.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build_container.sh b/build_container.sh index a8c9915..16e5153 100755 --- a/build_container.sh +++ b/build_container.sh @@ -77,6 +77,12 @@ if [ "$ARCH" != "riscv64" ]; then rustup target add $ARCH-unknown-linux-musl $ARCH-unknown-none fi +# The below are only used for compile-testing via cargo check. +# It suffices to do that on _one_ architecture. +if [ "$ARCH" == "x86_64" ]; then + rustup target add aarch64-apple-darwin x86_64-pc-windows-gnu +fi + cargo install cargo-llvm-cov # Install the codecov.io uploader. Not available on riscv64, so skip there