ci: Take stable and minimum supported Rust version (MSRV) from template variables

And don't make the actual version numbers part of the jobs.
This commit is contained in:
Sebastian Dröge 2020-11-01 12:13:36 +02:00 committed by Sebastian Dröge
parent 4c4ed6eed2
commit 8e4cca6981

View file

@ -35,12 +35,12 @@ stages:
.debian:10-stable: .debian:10-stable:
extends: .debian:10 extends: .debian:10
variables: variables:
RUST_VERSION: "1.46.0" RUST_VERSION: "$GST_RS_STABLE"
.debian:10-1-41: .debian:10-msrv:
extends: .debian:10 extends: .debian:10
variables: variables:
RUST_VERSION: "1.41.0" RUST_VERSION: "$GST_RS_MSRV"
.debian:10-nightly: .debian:10-nightly:
extends: .debian:10 extends: .debian:10
@ -62,10 +62,10 @@ build-stable:
- .build-debian-container - .build-debian-container
- .debian:10-stable - .debian:10-stable
build-1-41: build-msrv:
extends: extends:
- .build-debian-container - .build-debian-container
- .debian:10-1-41 - .debian:10-msrv
build-nightly: build-nightly:
extends: extends:
@ -80,10 +80,10 @@ update-stable:
variables: variables:
FDO_FORCE_REBUILD: 1 FDO_FORCE_REBUILD: 1
update-1-41: update-msrv:
extends: build-1-41 extends: build-msrv
rules: rules:
- if: '$UPDATE_IMG == "1-41"' - if: '$UPDATE_IMG == "msrv"'
variables: variables:
FDO_FORCE_REBUILD: 1 FDO_FORCE_REBUILD: 1
@ -107,10 +107,10 @@ update-nightly:
- .dist-debian-container - .dist-debian-container
- .debian:10-stable - .debian:10-stable
.img-1-41: .img-msrv:
extends: extends:
- .dist-debian-container - .dist-debian-container
- .debian:10-1-41 - .debian:10-msrv
.img-nightly: .img-nightly:
extends: extends:
@ -127,12 +127,12 @@ update-nightly:
- cargo build --locked --color=always --all --examples --all-features - cargo build --locked --color=always --all --examples --all-features
- G_DEBUG=fatal_warnings cargo test --locked --color=always --all --examples --all-features - G_DEBUG=fatal_warnings cargo test --locked --color=always --all --examples --all-features
test 1.41: test msrv:
extends: extends:
- '.cargo test' - '.cargo test'
- .img-1-41 - .img-msrv
rules: rules:
- if: '$UPDATE_IMG == null || $UPDATE_IMG == "1-41"' - if: '$UPDATE_IMG == null || $UPDATE_IMG == "msrv"'
test stable: test stable:
extends: extends: