forked from mirrors/gstreamer-rs
ci: move f.do_distro_{tag, exec} vars to the jobs
The gitlab parser will only expand the variables once, which make it impossible to abstract over the rust version in a nice way. A hacky workaround is to duplicate some things and get rid of the RUST_VERSION var to avoid the issue. https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/618#note_679774
This commit is contained in:
parent
773d92f9f5
commit
3bab13b228
1 changed files with 6 additions and 5 deletions
|
@ -41,7 +41,6 @@ stages:
|
||||||
.debian:10:
|
.debian:10:
|
||||||
variables:
|
variables:
|
||||||
FDO_DISTRIBUTION_VERSION: 10
|
FDO_DISTRIBUTION_VERSION: 10
|
||||||
FDO_DISTRIBUTION_TAG: '$RUST_VERSION-$GST_RS_IMG_TAG'
|
|
||||||
before_script:
|
before_script:
|
||||||
- source ./ci/env.sh
|
- source ./ci/env.sh
|
||||||
- mkdir .cargo && echo -e "[net]\ngit-fetch-with-cli = true" > .cargo/config
|
- mkdir .cargo && echo -e "[net]\ngit-fetch-with-cli = true" > .cargo/config
|
||||||
|
@ -61,18 +60,21 @@ stages:
|
||||||
.debian:10-stable:
|
.debian:10-stable:
|
||||||
extends: .debian:10
|
extends: .debian:10
|
||||||
variables:
|
variables:
|
||||||
RUST_VERSION: '$GST_RS_STABLE'
|
|
||||||
RUST_IMAGE_FULL: "1"
|
RUST_IMAGE_FULL: "1"
|
||||||
|
FDO_DISTRIBUTION_TAG: '$GST_RS_STABLE-$GST_RS_IMG_TAG'
|
||||||
|
FDO_DISTRIBUTION_EXEC: 'bash ci/install-rust.sh $GST_RS_STABLE $RUST_IMAGE_FULL'
|
||||||
|
|
||||||
.debian:10-msrv:
|
.debian:10-msrv:
|
||||||
extends: .debian:10
|
extends: .debian:10
|
||||||
variables:
|
variables:
|
||||||
RUST_VERSION: '$GST_RS_MSRV'
|
FDO_DISTRIBUTION_TAG: '$GST_RS_MSRV-$GST_RS_IMG_TAG'
|
||||||
|
FDO_DISTRIBUTION_EXEC: 'bash ci/install-rust.sh $GST_RS_MSRV $RUST_IMAGE_FULL'
|
||||||
|
|
||||||
.debian:10-nightly:
|
.debian:10-nightly:
|
||||||
extends: .debian:10
|
extends: .debian:10
|
||||||
variables:
|
variables:
|
||||||
RUST_VERSION: 'nightly'
|
FDO_DISTRIBUTION_TAG: 'nightly-$GST_RS_IMG_TAG'
|
||||||
|
FDO_DISTRIBUTION_EXEC: 'bash ci/install-rust.sh nightly $RUST_IMAGE_FULL'
|
||||||
|
|
||||||
.build-base-image:
|
.build-base-image:
|
||||||
extends:
|
extends:
|
||||||
|
@ -88,7 +90,6 @@ stages:
|
||||||
stage: container-final
|
stage: container-final
|
||||||
variables:
|
variables:
|
||||||
FDO_BASE_IMAGE: '$CI_REGISTRY_IMAGE/debian/10:base-$GST_RS_IMG_TAG'
|
FDO_BASE_IMAGE: '$CI_REGISTRY_IMAGE/debian/10:base-$GST_RS_IMG_TAG'
|
||||||
FDO_DISTRIBUTION_EXEC: 'bash ci/install-rust.sh $RUST_VERSION $RUST_IMAGE_FULL'
|
|
||||||
|
|
||||||
build-base:
|
build-base:
|
||||||
extends:
|
extends:
|
||||||
|
|
Loading…
Reference in a new issue