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 'socksonme/fix_coverage_shell_script' into 'master'

Browse Source 
Fix coverage shell script

See merge request veloren/veloren!3552
This commit is contained in:
Marcel 2022-08-20 13:14:32 +00:00
commit cafef52b01
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab/scripts/coverage.sh
View File

@ -1,6 +1,5 @@
#!/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
find ./* -name "Cargo.toml" -exec sed -i 's/, "simd"]/]/g' {} \; find ./* -name "Cargo.toml" -exec sed -i -E 's/, *"simd"|"simd" *,|"simd"//g' {} \;
find ./* -name "Cargo.toml" -exec sed -i 's/"simd"]/]/g' {} \;
export VELOREN_ASSETS="$(pwd)/assets"; export VELOREN_ASSETS="$(pwd)/assets";
time cargo tarpaulin --skip-clean -v -- --test-threads=2; time cargo tarpaulin --skip-clean -v -- --test-threads=2;

2
voxygen/Cargo.toml
View File

@ -35,7 +35,7 @@ shaderc-from-source = ["shaderc/build-from-source"]
discord = ["discord-sdk"] discord = ["discord-sdk"]
# We don't ship egui with published release builds so a separate feature is required that excludes it. # We don't ship egui with published release builds so a separate feature is required that excludes it.
default-publish = ["singleplayer", "native-dialog", "plugins", "discord", "simd"] # keep simd the last in this list default-publish = ["singleplayer", "native-dialog", "plugins", "discord", "simd"]
# Temp for bug on current wgpu version that has access violation in vulkan when constructing egui pipeline # Temp for bug on current wgpu version that has access violation in vulkan when constructing egui pipeline
default-no-egui = ["default-publish", "hot-reloading", "shaderc-from-source"] default-no-egui = ["default-publish", "hot-reloading", "shaderc-from-source"]
default = ["default-no-egui", "egui-ui"] default = ["default-no-egui", "egui-ui"]