diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2020-11-01 13:13:36 +0300 |
---|---|---|
committer | Sebastian Dröge <slomo@coaxion.net> | 2020-11-05 20:11:55 +0300 |
commit | 8e4cca6981bf0de9daafe0de56714244939bc705 (patch) | |
tree | 2ad02759f33d1534343e7f6b83c650adc5486374 /.gitlab-ci.yml | |
parent | 4c4ed6eed27a87d131e79c15967d8c6e9c605d32 (diff) |
ci: Take stable and minimum supported Rust version (MSRV) from template variables
And don't make the actual version numbers part of the jobs.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2fe1cd0..1414549e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,12 +35,12 @@ stages: .debian:10-stable: extends: .debian:10 variables: - RUST_VERSION: "1.46.0" + RUST_VERSION: "$GST_RS_STABLE" -.debian:10-1-41: +.debian:10-msrv: extends: .debian:10 variables: - RUST_VERSION: "1.41.0" + RUST_VERSION: "$GST_RS_MSRV" .debian:10-nightly: extends: .debian:10 @@ -62,10 +62,10 @@ build-stable: - .build-debian-container - .debian:10-stable -build-1-41: +build-msrv: extends: - .build-debian-container - - .debian:10-1-41 + - .debian:10-msrv build-nightly: extends: @@ -80,10 +80,10 @@ update-stable: variables: FDO_FORCE_REBUILD: 1 -update-1-41: - extends: build-1-41 +update-msrv: + extends: build-msrv rules: - - if: '$UPDATE_IMG == "1-41"' + - if: '$UPDATE_IMG == "msrv"' variables: FDO_FORCE_REBUILD: 1 @@ -107,10 +107,10 @@ update-nightly: - .dist-debian-container - .debian:10-stable -.img-1-41: +.img-msrv: extends: - .dist-debian-container - - .debian:10-1-41 + - .debian:10-msrv .img-nightly: extends: @@ -127,12 +127,12 @@ update-nightly: - cargo build --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: - '.cargo test' - - .img-1-41 + - .img-msrv rules: - - if: '$UPDATE_IMG == null || $UPDATE_IMG == "1-41"' + - if: '$UPDATE_IMG == null || $UPDATE_IMG == "msrv"' test stable: extends: |