Merged check and unit tests into single step

Reordered commands to run quickest first in order to tie up least CI resource
Fixed some clippy errors in examples
This commit is contained in:
Ben Wallis 2021-01-08 19:23:43 +00:00 committed by Acrimon
parent 12e66faf57
commit a590595149
No known key found for this signature in database
GPG Key ID: FE567F46AFBDF3AE
2 changed files with 6 additions and 15 deletions

View File

@ -1,15 +1,3 @@
unittests:
extends: .recompile-branch
stage: build
variables:
GIT_DEPTH: 9999999999999
script:
- ln -s /dockercache/cache-all target
- cargo test --package veloren-voxygen --lib test_all_localizations -- --nocapture --ignored
- cargo test
retry:
max: 2
benchmarks: benchmarks:
extends: .recompile-branch extends: .recompile-branch
stage: build stage: build

View File

@ -1,11 +1,14 @@
# cargo clippy is a superset of cargo check, so we don't check manually check:
code-quality:
extends: .recompile-branch extends: .recompile-branch
stage: check stage: check
script: script:
- ln -s /dockercache/cache-all target - ln -s /dockercache/cache-all target
- cargo clippy --all-targets --locked -- -D warnings
- cargo fmt --all -- --check - cargo fmt --all -- --check
# TODO: currently there are some examples that fail clippy
# - cargo clippy --all-targets --locked -- -D warnings
- cargo clippy --bins --tests --locked -- -D warnings
- cargo test
- cargo test --package veloren-voxygen --lib test_all_localizations -- --nocapture --ignored
security: security:
extends: .recompile-branch extends: .recompile-branch