diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.com> | 2021-01-04 18:03:44 +0300 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.com> | 2021-01-04 18:04:52 +0300 |
| commit | 595616fe2d7a4c5404e5726eeca05ad0b9a19bec (patch) | |
| tree | 9e017a7d98519883c98dcc00af7b1ae03197a81b | |
| parent | fdc3ea68e8276ca9eaac077997d5d2e975af58ad (diff) | |
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.
| -rw-r--r-- | .gitlab-ci.yml | 9 | ||||
| -rwxr-xr-x | ci/install-rust-ext.sh | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d62833a5..e1775758c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,19 +33,19 @@ stages: .debian:10-stable: extends: .debian:10 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" .debian:10-msrv: extends: .debian:10 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" .debian:10-nightly: extends: .debian:10 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" .build-debian-container: @@ -57,8 +57,7 @@ stages: FDO_DISTRIBUTION_EXEC: >- bash ci/install-dav1d.sh && apt clean && - source ./ci/env.sh && - cargo install cargo-c + bash ./ci/install-rust-ext.sh rules: - if: '$UPDATE_IMG == null' diff --git a/ci/install-rust-ext.sh b/ci/install-rust-ext.sh new file mode 100755 index 000000000..b3cefea01 --- /dev/null +++ b/ci/install-rust-ext.sh @@ -0,0 +1,6 @@ +source ./ci/env.sh + +set -e +export CARGO_HOME='/usr/local/cargo' + +cargo install cargo-c
\ No newline at end of file |