From 512f5b52fc48380728989afbd968155b66f4cd77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 11 Aug 2020 10:38:05 +0300 Subject: [PATCH] ci: Use Rust 1.44.1 explicitly for the 0.16 branch --- ci/images_template.yml | 2 +- ci/install-rust.sh | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ci/images_template.yml b/ci/images_template.yml index 651447523..efb71b56f 100644 --- a/ci/images_template.yml +++ b/ci/images_template.yml @@ -1,2 +1,2 @@ variables: - GST_RS_IMG_TAG: '2020-08-11.0-0.16' + GST_RS_IMG_TAG: '2020-08-11.2-0.16' diff --git a/ci/install-rust.sh b/ci/install-rust.sh index 53bc93425..175032315 100755 --- a/ci/install-rust.sh +++ b/ci/install-rust.sh @@ -7,6 +7,10 @@ RUSTUP_VERSION=1.21.1 RUST_VERSION=$1 RUST_ARCH="x86_64-unknown-linux-gnu" +if [ "$RUST_VERSION" = "stable" ]; then + RUST_VERSION="1.44.1" +fi + RUSTUP_URL=https://static.rust-lang.org/rustup/archive/$RUSTUP_VERSION/$RUST_ARCH/rustup-init wget $RUSTUP_URL @@ -19,9 +23,9 @@ rustup --version cargo --version rustc --version -if [ "$RUST_VERSION" = "stable" ]; then - rustup component add clippy-preview - rustup component add rustfmt +if [ "$RUST_VERSION" = "1.44.1" ]; then + rustup component add clippy-preview --toolchain $RUST_VERSION + rustup component add rustfmt --toolchain $RUST_VERSION cargo install --force cargo-deny cargo install --force --git https://github.com/kbknapp/cargo-outdated fi