From 326e5861f31a482ca7fccb95bcc515c3740c4d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 5 Aug 2024 12:33:58 +0300 Subject: [PATCH] ci: Don't use --locked for cargo-outdated / grcov with 1.80 / nightly Part-of: --- ci/install-rust.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ci/install-rust.sh b/ci/install-rust.sh index ebe2b448c..b9a37fada 100755 --- a/ci/install-rust.sh +++ b/ci/install-rust.sh @@ -27,12 +27,22 @@ if [ "$RUST_IMAGE_FULL" = "1" ]; then rustup component add rustfmt cargo install --locked --force cargo-deny - cargo install --locked --force cargo-outdated + if [ "$RUST_VERSION" = "nightly" -o "$RUST_VERSION" = "1.80.0" ]; then + # Don't use --locked because time-0.3.30 does not build with 1.80 or newer + cargo install --force cargo-outdated + else + cargo install --locked --force cargo-outdated + fi cargo install --locked --force typos-cli --version "1.19.0" # Coverage tools rustup component add llvm-tools-preview - cargo install --locked --force grcov + if [ "$RUST_VERSION" = "nightly" -o "$RUST_VERSION" = "1.80.0" ]; then + # Don't use --locked because time-0.3.30 does not build with 1.80 or newer + cargo install --force grcov + else + cargo install --locked --force grcov + fi fi if [ "$RUST_VERSION" = "nightly" -o "$RUST_VERSION" = "1.80.0" ]; then