ci: add rustfmt to Ubuntu container

Signed-off-by: Paolo Bonzini <[email protected]>
mesonbuild · Dec 19, 2024 · 3f5469c · 3f5469c
1 parent 303916d
commit 3f5469c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ci/ciimage/ubuntu-rolling/install.sh b/ci/ciimage/ubuntu-rolling/install.sh
@@ -58,7 +58,7 @@ dub build dubtestproject:test2 --compiler=ldc2
 # Remove debian version of Rust and install latest with rustup.
 # This is needed to get the cross toolchain as well.
 apt-get -y remove rustc || true
-wget -O - https://sh.rustup.rs | sh -s -- -y --profile minimal --component clippy
+wget -O - https://sh.rustup.rs | sh -s -- -y --profile minimal --component clippy --component rustfmt
 source "$HOME/.cargo/env"
 rustup target add x86_64-pc-windows-gnu
 rustup target add arm-unknown-linux-gnueabihf

diff --git a/ci/run.ps1 b/ci/run.ps1
@@ -21,8 +21,8 @@ if ($env:arch -eq 'x64') {
     $env:Path = "C:\hostedtoolcache\windows\Python\3.7.9\x86;C:\hostedtoolcache\windows\Python\3.7.9\x86\Scripts;$env:Path"
 }
 
-# Also install clippy
-rustup component add clippy
+# Also install clippy and rustfmt for unittests
+rustup component add clippy rustfmt
 
 # Set the CI env var for the meson test framework
 $env:CI = '1'