fix ci, which was broken by merging unittests and check

This commit is contained in:
Marcel Märtens 2021-01-23 23:05:24 +01:00
parent 39d1c9e885
commit 3d195348d2
2 changed files with 15 additions and 6 deletions

View File

@ -1,3 +1,15 @@
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,14 +1,11 @@
check: # cargo clippy is a superset of cargo check, so we don't check manually
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