diff --git a/.gitlab/scripts/benchmark.sh b/.gitlab/scripts/benchmark.sh index 7aa871b8ea..492f70d10b 100755 --- a/.gitlab/scripts/benchmark.sh +++ b/.gitlab/scripts/benchmark.sh @@ -1,2 +1,4 @@ #!/bin/bash +rm -r target/release/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly +rm -r target/release/incremental/* || echo "all good" # TMP FIX FOR 2021-03-22-nightly time cargo bench \ No newline at end of file diff --git a/.gitlab/scripts/code-quality.sh b/.gitlab/scripts/code-quality.sh index 8b4146c7a8..3a07d71057 100755 --- a/.gitlab/scripts/code-quality.sh +++ b/.gitlab/scripts/code-quality.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -r target/debug/incremental/* || echo "all good" # TMP FIX FOR 2021-03-22-nightly time cargo clippy --all-targets --locked --features="bin_compression,bin_csv,bin_graphviz,bin_bot,asset_tweak" -- -D warnings && # Ensure that the veloren-voxygen default-publish feature builds as it excludes some default features time cargo clippy -p veloren-voxygen --locked --no-default-features --features="default-publish" -- -D warnings && diff --git a/.gitlab/scripts/coverage.sh b/.gitlab/scripts/coverage.sh index 6c6b034039..30047ff574 100755 --- a/.gitlab/scripts/coverage.sh +++ b/.gitlab/scripts/coverage.sh @@ -1,5 +1,6 @@ #!/bin/bash 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 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; diff --git a/.gitlab/scripts/linux.sh b/.gitlab/scripts/linux.sh index 80c02ae9cd..4c0ba95904 100755 --- a/.gitlab/scripts/linux.sh +++ b/.gitlab/scripts/linux.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -r target/release/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly export VELOREN_USERDATA_STRATEGY=executable 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/unittest.sh b/.gitlab/scripts/unittest.sh index 9b1c59bfd5..a4193d3914 100755 --- a/.gitlab/scripts/unittest.sh +++ b/.gitlab/scripts/unittest.sh @@ -1,5 +1,7 @@ #!/bin/bash export VELOREN_ASSETS="$(pwd)/assets" +rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly time cargo test --package veloren-i18n --lib test_all_localizations -- --nocapture --ignored && time cargo test --package veloren-common-assets asset_tweak::tests --features asset_tweak --lib && +( rm -r target/debug/incremental* || echo "all good" ) && # TMP FIX FOR 2021-03-22-nightly time cargo test \ No newline at end of file diff --git a/.gitlab/scripts/windows.sh b/.gitlab/scripts/windows.sh index 3b2291328f..ff395e0016 100755 --- a/.gitlab/scripts/windows.sh +++ b/.gitlab/scripts/windows.sh @@ -1,5 +1,6 @@ #!/bin/bash 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 +rm -r target/release/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly 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