ci: move coverage to the last block (#31163)
This commit is contained in:
parent
2147f0d056
commit
1bf69b448b
|
@ -142,22 +142,6 @@ all_test_steps() {
|
||||||
command_step checks ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-checks.sh" 20 check
|
command_step checks ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-checks.sh" 20 check
|
||||||
wait_step
|
wait_step
|
||||||
|
|
||||||
# Coverage...
|
|
||||||
if affects \
|
|
||||||
.rs$ \
|
|
||||||
Cargo.lock$ \
|
|
||||||
Cargo.toml$ \
|
|
||||||
^ci/rust-version.sh \
|
|
||||||
^ci/test-coverage.sh \
|
|
||||||
^scripts/coverage.sh \
|
|
||||||
; then
|
|
||||||
command_step coverage ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-coverage.sh" 80
|
|
||||||
wait_step
|
|
||||||
else
|
|
||||||
annotate --style info --context test-coverage \
|
|
||||||
"Coverage skipped as no .rs files were modified"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Full test suite
|
# Full test suite
|
||||||
command_step stable ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-stable.sh" 70
|
command_step stable ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-stable.sh" 70
|
||||||
|
|
||||||
|
@ -300,6 +284,21 @@ EOF
|
||||||
command_step "local-cluster-slow-2" \
|
command_step "local-cluster-slow-2" \
|
||||||
". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-local-cluster-slow-2.sh" \
|
". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-local-cluster-slow-2.sh" \
|
||||||
40
|
40
|
||||||
|
|
||||||
|
# Coverage...
|
||||||
|
if affects \
|
||||||
|
.rs$ \
|
||||||
|
Cargo.lock$ \
|
||||||
|
Cargo.toml$ \
|
||||||
|
^ci/rust-version.sh \
|
||||||
|
^ci/test-coverage.sh \
|
||||||
|
^scripts/coverage.sh \
|
||||||
|
; then
|
||||||
|
command_step coverage ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-coverage.sh" 80
|
||||||
|
else
|
||||||
|
annotate --style info --context test-coverage \
|
||||||
|
"Coverage skipped as no .rs files were modified"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
pull_or_push_steps() {
|
pull_or_push_steps() {
|
||||||
|
|
|
@ -137,22 +137,6 @@ all_test_steps() {
|
||||||
command_step checks ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-checks.sh" 20
|
command_step checks ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-checks.sh" 20
|
||||||
wait_step
|
wait_step
|
||||||
|
|
||||||
# Coverage...
|
|
||||||
if affects \
|
|
||||||
.rs$ \
|
|
||||||
Cargo.lock$ \
|
|
||||||
Cargo.toml$ \
|
|
||||||
^ci/rust-version.sh \
|
|
||||||
^ci/test-coverage.sh \
|
|
||||||
^scripts/coverage.sh \
|
|
||||||
; then
|
|
||||||
command_step coverage ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-coverage.sh" 80
|
|
||||||
wait_step
|
|
||||||
else
|
|
||||||
annotate --style info --context test-coverage \
|
|
||||||
"Coverage skipped as no .rs files were modified"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Full test suite
|
# Full test suite
|
||||||
command_step stable ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-stable.sh" 70
|
command_step stable ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-stable.sh" 70
|
||||||
|
|
||||||
|
@ -287,6 +271,21 @@ EOF
|
||||||
command_step "local-cluster-slow-2" \
|
command_step "local-cluster-slow-2" \
|
||||||
". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-local-cluster-slow-2.sh" \
|
". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-local-cluster-slow-2.sh" \
|
||||||
40
|
40
|
||||||
|
|
||||||
|
# Coverage...
|
||||||
|
if affects \
|
||||||
|
.rs$ \
|
||||||
|
Cargo.lock$ \
|
||||||
|
Cargo.toml$ \
|
||||||
|
^ci/rust-version.sh \
|
||||||
|
^ci/test-coverage.sh \
|
||||||
|
^scripts/coverage.sh \
|
||||||
|
; then
|
||||||
|
command_step coverage ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-coverage.sh" 80
|
||||||
|
else
|
||||||
|
annotate --style info --context test-coverage \
|
||||||
|
"Coverage skipped as no .rs files were modified"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
pull_or_push_steps() {
|
pull_or_push_steps() {
|
||||||
|
|
Loading…
Reference in New Issue