From 26d32d1273b64621253eae1685ab9c888cee65da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= Date: Fri, 16 Jul 2021 10:39:47 +0200 Subject: [PATCH] fix scripts that ended with && and correct the ASSETS variable for tests --- .gitlab/scripts/coverage.sh | 1 + .gitlab/scripts/linux.sh | 2 +- .gitlab/scripts/windows.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab/scripts/coverage.sh b/.gitlab/scripts/coverage.sh index ced9c46f6e..6c6b034039 100755 --- a/.gitlab/scripts/coverage.sh +++ b/.gitlab/scripts/coverage.sh @@ -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; \ No newline at end of file diff --git a/.gitlab/scripts/linux.sh b/.gitlab/scripts/linux.sh index e0530fc623..80c02ae9cd 100755 --- a/.gitlab/scripts/linux.sh +++ b/.gitlab/scripts/linux.sh @@ -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) \ No newline at end of file diff --git a/.gitlab/scripts/windows.sh b/.gitlab/scripts/windows.sh index bbbc630b36..3b2291328f 100755 --- a/.gitlab/scripts/windows.sh +++ b/.gitlab/scripts/windows.sh @@ -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 && \ No newline at end of file +time cargo build --target=x86_64-pc-windows-gnu --release --no-default-features --features default-publish \ No newline at end of file