Merge branch 'xMAC94x/fix_scripts' into 'master'

fix scripts that ended with &&

See merge request veloren/veloren!2614
This commit is contained in:
Marcel 2021-07-17 14:35:58 +00:00
commit 8d18c2be1f
3 changed files with 3 additions and 2 deletions

View File

@ -3,4 +3,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 's/"simd"]/]/g' {} \;
sed -i 's/vek /#vek /g' ./Cargo.toml;
export VELOREN_ASSETS="$(pwd)/assets";
time cargo tarpaulin --skip-clean -v -- --test-threads=2;

View File

@ -1,4 +1,4 @@
#!/bin/bash
export VELOREN_USERDATA_STRATEGY=executable
time cargo build --release --no-default-features --features default-publish &&
time cargo build --release --no-default-features --features default-publish
# eveluate --bin instead, last time i checked (2021-07-14) it was 2 minutes slower on release (but faster on debug)

View File

@ -2,4 +2,4 @@
update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
export VELOREN_USERDATA_STRATEGY=executable
time cargo build --target=x86_64-pc-windows-gnu --release --no-default-features --features default-publish &&
time cargo build --target=x86_64-pc-windows-gnu --release --no-default-features --features default-publish