From be85c31da88e18b5743f43aa6cb43bd7bb05ee52 Mon Sep 17 00:00:00 2001 From: Trevor Spiteri Date: Thu, 16 Jul 2020 10:35:00 +0200 Subject: [PATCH] ci: test building with num-traits feature --- .appveyor.yml | 23 ++++++-- .gitlab-ci.yml | 151 +++++++++++++++++++++++++++++++++---------------- 2 files changed, 122 insertions(+), 52 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index fba9a7a..e871a2f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -32,26 +32,41 @@ before_test: - bash -c "if [ -d $USERPROFILE/.cargo/registry/cache ]; then cd $USERPROFILE/.cargo/registry; find cache -name \*.crate | sort; fi" test_script: - - cargo +beta-%TARGET% clippy --all-targets --features "fail-on-warnings az f16 serde std" + - cargo +beta-%TARGET% clippy --all-targets --features "fail-on-warnings az f16 num-traits serde std" + - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings az f16 num-traits serde" + - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings az f16 num-traits std" + - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings az f16 num-traits" + - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings az f16 serde std" - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings az f16 serde" - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings az f16 std" - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings az f16" + - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings az num-traits serde std" + - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings az num-traits serde" + - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings az num-traits std" + - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings az num-traits" - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings az serde std" - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings az serde" - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings az std" - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings az" - - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings az" + - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings f16 num-traits serde std" + - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings f16 num-traits serde" + - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings f16 num-traits std" + - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings f16 num-traits" - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings f16 serde std" - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings f16 serde" - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings f16 std" - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings f16" + - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings num-traits serde std" + - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings num-traits serde" + - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings num-traits std" + - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings num-traits" - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings serde std" - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings serde" - cargo +beta-%TARGET% check --all-targets --features "fail-on-warnings std" - cargo +beta-%TARGET% check --all-targets --features fail-on-warnings - - cargo +beta-%TARGET% test --release --features "fail-on-warnings az f16 serde" + - cargo +beta-%TARGET% test --release --features "fail-on-warnings az f16 num-traits serde std" - cargo +beta-%TARGET% fmt -- --check - - cargo +1.44.0-%TARGET% test --lib --features "fail-on-warnings az f16 serde" + - cargo +1.44.0-%TARGET% test --lib --features "fail-on-warnings az f16 num-traits serde std" after_test: - bash -c "if [ -d $USERPROFILE/.cargo/registry/cache ]; then cd $USERPROFILE/.cargo/registry; for c in cache/*/*.crate; do s=src/${c#cache/}; if [ ! -e ${s/.crate/} ]; then rm -v $c; fi; done; find cache -name \*.crate | sort; fi" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4de7b6e..8292e23 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,8 +9,6 @@ before_script: - getconf LONG_BIT - rustup self update - rustup --version - - rustup toolchain install --profile minimal beta-$TARGET 1.44.0-$TARGET - - rustup component add --toolchain beta-$TARGET rustfmt clippy - if [ -d cargo/registry/cache ]; then rm -rf $CARGO_HOME/registry/cache; mkdir -p $CARGO_HOME/registry; cp -R cargo/registry/cache $CARGO_HOME/registry/; echo Copied registry/cache; fi - if [ -d $CARGO_HOME/registry/src ]; then rm -r $CARGO_HOME/registry/src; fi - if [ -d $CARGO_HOME/registry/cache ]; then (cd $CARGO_HOME/registry; find cache -name \*.crate | sort) fi @@ -30,28 +28,11 @@ x86_64-gnulinux: paths: - cargo/ script: - - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az f16 serde std" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings az f16 serde" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings az f16 std" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings az f16" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings az serde std" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings az serde" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings az std" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings az" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings az" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings f16 serde std" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings f16 serde" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings f16 std" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings f16" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings serde std" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings serde" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings std" - - cargo +beta-$TARGET check --all-targets --features fail-on-warnings - - cargo +beta-$TARGET test --features "fail-on-warnings az f16 serde std" - - cargo +beta-$TARGET test --release --features "fail-on-warnings az f16 serde std" - - cargo +beta-$TARGET fmt -- --check - - cargo +1.44.0-$TARGET test --lib --features "fail-on-warnings az f16 serde std" - - cargo +1.44.0-$TARGET test --release --lib --features "fail-on-warnings az f16 serde std" + - rustup toolchain install --profile minimal beta-$TARGET 1.44.0-$TARGET + - cargo +beta-$TARGET test --features "fail-on-warnings az f16 num-traits serde std" + - cargo +beta-$TARGET test --release --features "fail-on-warnings az f16 num-traits serde std" + - cargo +1.44.0-$TARGET test --lib --features "fail-on-warnings az f16 num-traits serde std" + - cargo +1.44.0-$TARGET test --release --lib --features "fail-on-warnings az f16 num-traits serde std" i686-gnulinux: image: i386/rust:1 @@ -62,28 +43,101 @@ i686-gnulinux: paths: - cargo/ script: - - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az f16 serde std" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings az f16 serde" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings az f16 std" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings az f16" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings az serde std" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings az serde" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings az std" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings az" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings az" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings f16 serde std" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings f16 serde" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings f16 std" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings f16" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings serde std" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings serde" - - cargo +beta-$TARGET check --all-targets --features "fail-on-warnings std" - - cargo +beta-$TARGET check --all-targets --features fail-on-warnings - - cargo +beta-$TARGET test --features "fail-on-warnings f16 serde" - - cargo +beta-$TARGET test --release --features "fail-on-warnings az f16 serde std" + - rustup toolchain install --profile minimal beta-$TARGET 1.44.0-$TARGET + - cargo +beta-$TARGET test --features "fail-on-warnings az f16 num-traits serde std" + - cargo +beta-$TARGET test --release --features "fail-on-warnings az f16 num-traits serde std" + - cargo +1.44.0-$TARGET test --lib --features "fail-on-warnings az f16 num-traits serde std" + - cargo +1.44.0-$TARGET test --release --lib --features "fail-on-warnings az f16 num-traits serde std" + +x86_64-gnulinux-tidy: + image: amd64/rust:1 + variables: + TARGET: x86_64 + cache: + key: $CI_JOB_NAME + paths: + - cargo/ + script: + - rustup toolchain install --profile minimal beta-$TARGET + - rustup component add --toolchain beta-$TARGET rustfmt clippy - cargo +beta-$TARGET fmt -- --check - - cargo +1.44.0-$TARGET test --lib --features "fail-on-warnings az f16 serde std" - - cargo +1.44.0-$TARGET test --release --lib --features "fail-on-warnings az f16 serde std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az f16 num-traits serde std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az f16 num-traits serde" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az f16 num-traits std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az f16 num-traits" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az f16 serde std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az f16 serde" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az f16 std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az f16" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az num-traits serde std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az num-traits serde" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az num-traits std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az num-traits" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az serde std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az serde" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings f16 num-traits serde std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings f16 num-traits serde" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings f16 num-traits std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings f16 num-traits" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings f16 serde std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings f16 serde" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings f16 std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings f16" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings num-traits serde std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings num-traits serde" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings num-traits std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings num-traits" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings serde std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings serde" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings std" + - cargo +beta-$TARGET clippy --all-targets --features fail-on-warnings + +i686-gnulinux-tidy: + image: i386/rust:1 + variables: + TARGET: i686 + cache: + key: $CI_JOB_NAME + paths: + - cargo/ + script: + - rustup toolchain install --profile minimal beta-$TARGET + - rustup component add --toolchain beta-$TARGET rustfmt clippy + - cargo +beta-$TARGET fmt -- --check + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az f16 num-traits serde std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az f16 num-traits serde" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az f16 num-traits std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az f16 num-traits" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az f16 serde std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az f16 serde" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az f16 std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az f16" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az num-traits serde std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az num-traits serde" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az num-traits std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az num-traits" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az serde std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az serde" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings az" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings f16 num-traits serde std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings f16 num-traits serde" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings f16 num-traits std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings f16 num-traits" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings f16 serde std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings f16 serde" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings f16 std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings f16" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings num-traits serde std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings num-traits serde" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings num-traits std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings num-traits" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings serde std" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings serde" + - cargo +beta-$TARGET clippy --all-targets --features "fail-on-warnings std" + - cargo +beta-$TARGET clippy --all-targets --features fail-on-warnings x86_64-gnulinux-tarpaulin: image: amd64/rust:1 @@ -95,8 +149,9 @@ x86_64-gnulinux-tarpaulin: paths: - cargo/ script: - - cargo +beta-$TARGET install --version 0.12.3 --locked cargo-tarpaulin - - stdbuf -oL cargo +beta-$TARGET tarpaulin -v --ignore-tests --exclude-files build.rs --features "az f16 serde std" | tee tarpaulin.log + - rustup toolchain install --profile minimal beta-$TARGET + - cargo +beta-$TARGET install --version 0.14.2 --locked cargo-tarpaulin + - stdbuf -oL cargo +beta-$TARGET tarpaulin -v --ignore-tests --exclude-files build.rs --features "az f16 num-traits serde std" | tee tarpaulin.log - echo "Check that coverage not less than $REQ_COVERAGE%" - tail -1 tarpaulin.log | awk '{ if ($1 < '$REQ_COVERAGE') { exit 1 } }' @@ -113,7 +168,7 @@ pages: - rm -rf public - mkdir public - cp doc/index.html public - - cargo +nightly-$TARGET doc --no-deps --features "az f16 serde std" + - cargo +nightly-$TARGET doc --no-deps --features "az f16 num-traits serde std" - mv target/doc public/dev artifacts: paths: