ci: Fix version checks

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1491>
This commit is contained in:
Sebastian Dröge 2024-08-13 09:33:36 +03:00 committed by Jordan Petridis
parent 6674f8d23a
commit 6c5ceca804
3 changed files with 13 additions and 13 deletions

View file

@ -1,5 +1,5 @@
variables: variables:
GST_RS_IMG_TAG: "2024-08-05.0" GST_RS_IMG_TAG: "2024-08-13.0"
GST_RS_STABLE: "1.80.1" GST_RS_STABLE: "1.80.1"
GST_RS_MSRV: "1.71.1" GST_RS_MSRV: "1.71.1"
# The branch we use to build GStreamer from in the docker images # The branch we use to build GStreamer from in the docker images

View file

@ -27,28 +27,28 @@ if [ "$RUST_IMAGE_FULL" = "1" ]; then
rustup component add rustfmt rustup component add rustfmt
cargo install --locked --force cargo-deny cargo install --locked --force cargo-deny
if [ "$RUST_VERSION" = "nightly" -o "$RUST_VERSION" = "1.80.0" ]; then if [ "$RUST_VERSION" = "1.71.1" ]; then
cargo install --locked --force cargo-outdated
else
# Don't use --locked because time-0.3.30 does not build with 1.80 or newer # Don't use --locked because time-0.3.30 does not build with 1.80 or newer
cargo install --force cargo-outdated cargo install --force cargo-outdated
else
cargo install --locked --force cargo-outdated
fi fi
cargo install --locked --force typos-cli --version "1.19.0" cargo install --locked --force typos-cli --version "1.19.0"
# Coverage tools # Coverage tools
rustup component add llvm-tools-preview rustup component add llvm-tools-preview
if [ "$RUST_VERSION" = "nightly" -o "$RUST_VERSION" = "1.80.0" ]; then if [ "$RUST_VERSION" = "1.71.1" ]; then
cargo install --locked --force grcov
else
# Don't use --locked because time-0.3.30 does not build with 1.80 or newer # Don't use --locked because time-0.3.30 does not build with 1.80 or newer
cargo install --force grcov cargo install --force grcov
else
cargo install --locked --force grcov
fi fi
fi fi
if [ "$RUST_VERSION" = "nightly" -o "$RUST_VERSION" = "1.80.0" ]; then if [ "$RUST_VERSION" = "1.71.1" ]; then
cargo install --locked cargo-c --version 0.10.3+cargo-0.81
else
cargo install --locked cargo-c --version 0.9.26+cargo-0.74 cargo install --locked cargo-c --version 0.9.26+cargo-0.74
else
cargo install --locked cargo-c --version 0.10.3+cargo-0.81
fi fi
if [ "$RUST_VERSION" = "nightly" ]; then if [ "$RUST_VERSION" = "nightly" ]; then

View file

@ -4,10 +4,10 @@ rustup --version
rustc --version rustc --version
cargo --version cargo --version
if (("$RUST_VERSION" -eq "nightly") -or ("$RUST_VERSION" -eq "1.80.0" )) { if ("$RUST_VERSION" -eq "1.71.1") {
cargo install --locked cargo-c --version 0.10.3+cargo-0.81
} else {
cargo install --locked cargo-c --version 0.9.26+cargo-0.74 cargo install --locked cargo-c --version 0.9.26+cargo-0.74
} else {
cargo install --locked cargo-c --version 0.10.3+cargo-0.81
} }
if (!$?) { if (!$?) {