diff --git a/.gitlab/scripts/coverage.sh b/.gitlab/scripts/coverage.sh index f7b397f3dc..6addb4bd79 100755 --- a/.gitlab/scripts/coverage.sh +++ b/.gitlab/scripts/coverage.sh @@ -1,6 +1,5 @@ #!/bin/bash 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 's/"simd"]/]/g' {} \; +find ./* -name "Cargo.toml" -exec sed -i -E 's/, *"simd"|"simd" *,|"simd"//g' {} \; export VELOREN_ASSETS="$(pwd)/assets"; -time cargo tarpaulin --skip-clean -v -- --test-threads=2; +time cargo tarpaulin --skip-clean -v -- --test-threads=2; \ No newline at end of file diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index d956487fff..48d4026f18 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -35,7 +35,7 @@ shaderc-from-source = ["shaderc/build-from-source"] discord = ["discord-sdk"] # 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 default-no-egui = ["default-publish", "hot-reloading", "shaderc-from-source"] default = ["default-no-egui", "egui-ui"]