ci: install cargo-c to proper location

Need to define CARGO_HOME so it's installed to the same places as the
rest of the Rust tools.
This commit is contained in:
Guillaume Desmottes 2021-01-04 16:03:44 +01:00
parent fdc3ea68e8
commit 595616fe2d
2 changed files with 10 additions and 5 deletions

View file

@ -33,19 +33,19 @@ stages:
.debian:10-stable: .debian:10-stable:
extends: .debian:10 extends: .debian:10
variables: variables:
FDO_DISTRIBUTION_TAG: '$GST_RS_STABLE-${GST_RS_IMG_TAG}_2021-01-04.0' FDO_DISTRIBUTION_TAG: '$GST_RS_STABLE-${GST_RS_IMG_TAG}_2021-01-04.1'
FDO_BASE_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer-rs/debian/10:$GST_RS_STABLE-$GST_RS_IMG_TAG" FDO_BASE_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer-rs/debian/10:$GST_RS_STABLE-$GST_RS_IMG_TAG"
.debian:10-msrv: .debian:10-msrv:
extends: .debian:10 extends: .debian:10
variables: variables:
FDO_DISTRIBUTION_TAG: '$GST_RS_MSRV-${GST_RS_IMG_TAG}_2021-01-04.0' FDO_DISTRIBUTION_TAG: '$GST_RS_MSRV-${GST_RS_IMG_TAG}_2021-01-04.1'
FDO_BASE_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer-rs/debian/10:$GST_RS_MSRV-$GST_RS_IMG_TAG" FDO_BASE_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer-rs/debian/10:$GST_RS_MSRV-$GST_RS_IMG_TAG"
.debian:10-nightly: .debian:10-nightly:
extends: .debian:10 extends: .debian:10
variables: variables:
FDO_DISTRIBUTION_TAG: 'nightly-${GST_RS_IMG_TAG}_2021-01-04.0' FDO_DISTRIBUTION_TAG: 'nightly-${GST_RS_IMG_TAG}_2021-01-04.1'
FDO_BASE_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer-rs/debian/10:nightly-$GST_RS_IMG_TAG" FDO_BASE_IMAGE: "registry.freedesktop.org/gstreamer/gstreamer-rs/debian/10:nightly-$GST_RS_IMG_TAG"
.build-debian-container: .build-debian-container:
@ -57,8 +57,7 @@ stages:
FDO_DISTRIBUTION_EXEC: >- FDO_DISTRIBUTION_EXEC: >-
bash ci/install-dav1d.sh && bash ci/install-dav1d.sh &&
apt clean && apt clean &&
source ./ci/env.sh && bash ./ci/install-rust-ext.sh
cargo install cargo-c
rules: rules:
- if: '$UPDATE_IMG == null' - if: '$UPDATE_IMG == null'

6
ci/install-rust-ext.sh Executable file
View file

@ -0,0 +1,6 @@
source ./ci/env.sh
set -e
export CARGO_HOME='/usr/local/cargo'
cargo install cargo-c