CI: refactor to use 'extends' instead of anchors

This commit is contained in:
Jordan Petridis 2019-05-02 18:51:22 +03:00 committed by Sebastian Dröge
parent 5f1a50026d
commit bc355ea3ee

View file

@ -3,7 +3,7 @@ stages:
- "test" - "test"
- "extras" - "extras"
.tarball_setup: &setup .tarball_setup:
variables: variables:
# Only stuff inside the repo directory can be cached # Only stuff inside the repo directory can be cached
# Override the CARGO_HOME variable to force its location # Override the CARGO_HOME variable to force its location
@ -40,9 +40,9 @@ stages:
paths: paths:
- "${CARGO_HOME}" - "${CARGO_HOME}"
.cargo_test_template: &cargo_test .cargo test:
extends: '.tarball_setup'
stage: "test" stage: "test"
<<: *setup
script: script:
- rustc --version - rustc --version
- cargo build --color=always --all - cargo build --color=always --all
@ -54,20 +54,20 @@ test 1.31:
# 1.31 img # 1.31 img
# https://hub.docker.com/_/rust/ # https://hub.docker.com/_/rust/
image: "rust:1.31-slim" image: "rust:1.31-slim"
<<: *cargo_test extends: '.cargo test'
test stable: test stable:
# Stable img # Stable img
# https://hub.docker.com/_/rust/ # https://hub.docker.com/_/rust/
image: "rust:slim" image: "rust:slim"
<<: *cargo_test extends: '.cargo test'
test nightly: test nightly:
# Nightly # Nightly
# https://hub.docker.com/r/rustlang/rust/ # https://hub.docker.com/r/rustlang/rust/
image: "rustlang/rust:nightly-slim" image: "rustlang/rust:nightly-slim"
allow_failure: true allow_failure: true
<<: *cargo_test extends: '.cargo test'
rustfmt: rustfmt:
image: "rust:slim" image: "rust:slim"
@ -78,9 +78,9 @@ rustfmt:
- cargo fmt -- --color=always --check - cargo fmt -- --color=always --check
clippy: clippy:
extends: '.tarball_setup'
image: "rust:slim" image: "rust:slim"
stage: 'extras' stage: 'extras'
<<: *setup
script: script:
- rustup component add clippy-preview - rustup component add clippy-preview
- cargo clippy --version - cargo clippy --version