From db30cfcc74247dbd9f33899215852d70948e759a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 23 Oct 2021 10:37:55 +0300 Subject: [PATCH] ci: Install cargo-c 0.9.4 until our minimum supported Rust version is 1.56 --- .gitlab-ci.yml | 6 +++--- ci/install-rust-ext.sh | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 247629c5..50c97812 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,19 +43,19 @@ stages: .debian:11-stable: extends: .debian:11 variables: - FDO_DISTRIBUTION_TAG: '$GST_RS_STABLE-${GST_RS_IMG_TAG}_2021-10-12.0' + FDO_DISTRIBUTION_TAG: '$GST_RS_STABLE-${GST_RS_IMG_TAG}_2021-10-23.0' FDO_BASE_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer-rs/debian/bullseye-slim:$GST_RS_STABLE-$GST_RS_IMG_TAG" .debian:11-msrv: extends: .debian:11 variables: - FDO_DISTRIBUTION_TAG: '$GST_RS_MSRV-${GST_RS_IMG_TAG}_2021-10-12.0' + FDO_DISTRIBUTION_TAG: '$GST_RS_MSRV-${GST_RS_IMG_TAG}_2021-10-23.0' FDO_BASE_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer-rs/debian/bullseye-slim:$GST_RS_MSRV-$GST_RS_IMG_TAG" .debian:11-nightly: extends: .debian:11 variables: - FDO_DISTRIBUTION_TAG: 'nightly-${GST_RS_IMG_TAG}_2021-10-12.0' + FDO_DISTRIBUTION_TAG: 'nightly-${GST_RS_IMG_TAG}_2021-10-23.0' FDO_BASE_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer-rs/debian/bullseye-slim:nightly-$GST_RS_IMG_TAG" .build-debian-container: diff --git a/ci/install-rust-ext.sh b/ci/install-rust-ext.sh index b3cefea0..d3cd198a 100755 --- a/ci/install-rust-ext.sh +++ b/ci/install-rust-ext.sh @@ -3,4 +3,5 @@ source ./ci/env.sh set -e export CARGO_HOME='/usr/local/cargo' -cargo install cargo-c \ No newline at end of file +# Install 0.9.4 until Rust 1.56 is the minimum supported version here +cargo install cargo-c --version 0.9.4+cargo-0.56