From c646f8d1afc1169cd8411edce6dc395f966b037c Mon Sep 17 00:00:00 2001 From: Michael Mueller Date: Tue, 13 Jul 2021 16:14:21 +0200 Subject: [PATCH 1/2] Revert me: Remove `codecov` CI check --- .gitlab-ci.yml | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2ec0289f387..76639582576 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -186,51 +186,6 @@ spellcheck: cargo spellcheck check -vvv --cfg=.config/cargo_spellcheck.toml --checkers hunspell --code 1 examples/delegator/${contract}/; done -codecov: - stage: workspace - <<: *docker-env - <<: *test-refs - needs: - - job: check-std - artifacts: false - variables: - # For codecov it's sufficient to run the fuzz tests only once. - QUICKCHECK_TESTS: 1 - # Variables partly came from https://github.com/mozilla/grcov/blob/master/README.md - CARGO_INCREMENTAL: 0 - RUSTFLAGS: "-Zprofile -Zmir-opt-level=0 -Ccodegen-units=1 - -Copt-level=0 -Clink-dead-code -Coverflow-checks=off" - # The `cargo-taurpalin` coverage reporting tool seems to have better code instrumentation and thus - # produces better results for Rust codebases in general. However, unlike `grcov` it requires - # running docker with `--security-opt seccomp=unconfined` which is why we use `grcov` instead. - before_script: - - *rust-info-script - - unset "CARGO_TARGET_DIR" - - cargo clean - script: - # RUSTFLAGS are the cause target cache can't be used here - - cargo build --verbose --all-features --workspace - - cargo test --verbose --all-features --no-fail-fast --workspace - - # Just needed as long as we have the `ink-experimental-engine` feature. - # We must additionally run the coverage without `--all-features` here -- this - # would imply the feature `ink-experimental-engine`. So in order to still run - # the tests without the experimental engine feature we need this command. - - cargo test --verbose --features std --no-fail-fast --workspace - - # coverage with branches - - grcov . --source-dir . --output-type lcov --llvm --branch --ignore-not-existing - --ignore "/*" --ignore "tests/*" --output-path lcov-w-branch.info - - rust-covfix lcov-w-branch.info --output lcov-w-branch-fixed.info - # We'd like to not use a remote bash script for uploading the coverage reports, - # however this job seems to be more tricky than we hoped. - - bash <(curl -s https://codecov.io/bash) -t "$CODECOV_P_TOKEN" -f lcov-w-branch-fixed.info - # lines coverage - - grcov . --source-dir . --output-type lcov --llvm --ignore-not-existing - --ignore "/*" --ignore "tests/*" --output-path lcov-lines.info - - rust-covfix lcov-lines.info --output lcov-lines-fixed.info - - bash <(curl -s https://codecov.io/bash) -f lcov-lines-fixed.info - clippy-std: stage: workspace <<: *docker-env From 3a1bdc1d82fa109e65a4115953011f7b87beba85 Mon Sep 17 00:00:00 2001 From: Michael Mueller Date: Tue, 13 Jul 2021 16:21:02 +0200 Subject: [PATCH 2/2] Print `cargo-spellcheck` version --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 76639582576..8422ff64f95 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,6 +44,7 @@ workflow: - cargo --version - rustup +nightly show - cargo +nightly --version + - cargo spellcheck --version - bash --version - sccache -s