Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'xMAC94x/fix_tarpaulin' into 'master'

Browse Source 
choose correct path for tarpaulin

See merge request veloren/veloren!2642
This commit is contained in:
Marcel 2021-07-18 18:10:57 +00:00
commit efdb9bef6c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab/CI/recompile.yml
View File

@ -4,7 +4,7 @@
- if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"
# No '-' here is *very* important: https://docs.gitlab.com/ee/ci/yaml/#complex-rule-clauses # No '-' here is *very* important: https://docs.gitlab.com/ee/ci/yaml/#complex-rule-clauses
changes: changes:
- "**/*.{glsl,png,rs,ron,toml,vox,yml,wav}" - "**/*.{glsl,png,rs,ron,toml,vox,yml,wav,sh}"
- "rust-toolchain" - "rust-toolchain"
- "Cargo.lock" - "Cargo.lock"
- ".gitlab-ci.yml" - ".gitlab-ci.yml"
@ -14,7 +14,7 @@
.recompile: .recompile:
rules: rules:
- changes: - changes:
- "**/*.{glsl,png,rs,ron,toml,vox,yml,wav}" - "**/*.{glsl,png,rs,ron,toml,vox,yml,wav,sh}"
- "rust-toolchain" - "rust-toolchain"
- "Cargo.lock" - "Cargo.lock"
- ".gitlab-ci.yml" - ".gitlab-ci.yml"

2
.gitlab/scripts/coverage.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
echo "modifying files in 5s, ctrl+c to abort" && sleep 5 echo "modifying files in 5s, ctrl+c to abort" && sleep 5
rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly rm -r target/tarpaulin/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
find ./* -name "Cargo.toml" -exec sed -i 's/, "simd"]/]/g' {} \; find ./* -name "Cargo.toml" -exec sed -i 's/, "simd"]/]/g' {} \;
find ./* -name "Cargo.toml" -exec sed -i 's/"simd"]/]/g' {} \; find ./* -name "Cargo.toml" -exec sed -i 's/"simd"]/]/g' {} \;
sed -i 's/vek /#vek /g' ./Cargo.toml; sed -i 's/vek /#vek /g' ./Cargo.toml;