From 79128e1e4b5d46ef447dc0ca0d910eeebb02ddce Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Mon, 22 Nov 2021 02:04:19 -0500
Subject: [PATCH] Remove deletion of incremental folder from the CI scripts,
 the rustc incremental issue should be fixed

---
 .gitlab/scripts/benchmark.sh    | 4 +---
 .gitlab/scripts/code-quality.sh | 3 +--
 .gitlab/scripts/coverage.sh     | 3 +--
 .gitlab/scripts/env.sh          | 2 +-
 .gitlab/scripts/linux.sh        | 3 +--
 .gitlab/scripts/translation.sh  | 3 +--
 .gitlab/scripts/unittest.sh     | 4 +---
 .gitlab/scripts/windows.sh      | 3 +--
 8 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/.gitlab/scripts/benchmark.sh b/.gitlab/scripts/benchmark.sh
index 492f70d10b..53ad90f38c 100755
--- a/.gitlab/scripts/benchmark.sh
+++ b/.gitlab/scripts/benchmark.sh
@@ -1,4 +1,2 @@
 #!/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
+time cargo bench
diff --git a/.gitlab/scripts/code-quality.sh b/.gitlab/scripts/code-quality.sh
index 3d90661c9f..a8556c3942 100755
--- a/.gitlab/scripts/code-quality.sh
+++ b/.gitlab/scripts/code-quality.sh
@@ -1,6 +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_cmd_doc_gen,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 &&
-time cargo fmt --all -- --check
\ No newline at end of file
+time cargo fmt --all -- --check
diff --git a/.gitlab/scripts/coverage.sh b/.gitlab/scripts/coverage.sh
index 156a165a6c..396924871e 100755
--- a/.gitlab/scripts/coverage.sh
+++ b/.gitlab/scripts/coverage.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
 echo "modifying files in 5s, ctrl+c to abort" && sleep 5
-rm -r target/debug/incremental/* || 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;
 export VELOREN_ASSETS="$(pwd)/assets";
-time cargo tarpaulin --skip-clean -v -- --test-threads=2;
\ No newline at end of file
+time cargo tarpaulin --skip-clean -v -- --test-threads=2;
diff --git a/.gitlab/scripts/env.sh b/.gitlab/scripts/env.sh
index 710ba8a330..fc9c02167b 100644
--- a/.gitlab/scripts/env.sh
+++ b/.gitlab/scripts/env.sh
@@ -3,4 +3,4 @@
 export DISABLE_GIT_LFS_CHECK=true
 export VELOREN_ASSETS="assets"
 export RUSTFLAGS="-D warnings"
-export SHADERC_LIB_DIR=/shaderc/combined/
\ No newline at end of file
+export SHADERC_LIB_DIR=/shaderc/combined/
diff --git a/.gitlab/scripts/linux.sh b/.gitlab/scripts/linux.sh
index 4c0ba95904..db6cb8772e 100755
--- a/.gitlab/scripts/linux.sh
+++ b/.gitlab/scripts/linux.sh
@@ -1,5 +1,4 @@
 #!/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
+# eveluate --bin instead, last time i checked (2021-07-14) it was 2 minutes slower on release (but faster on debug)
diff --git a/.gitlab/scripts/translation.sh b/.gitlab/scripts/translation.sh
index d05fbf0b2a..e6393c5933 100755
--- a/.gitlab/scripts/translation.sh
+++ b/.gitlab/scripts/translation.sh
@@ -1,4 +1,3 @@
 #!/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-voxygen-i18n --lib test_all_localizations -- --nocapture --ignored
\ No newline at end of file
+time cargo test --package veloren-voxygen-i18n --lib test_all_localizations -- --nocapture --ignored
diff --git a/.gitlab/scripts/unittest.sh b/.gitlab/scripts/unittest.sh
index 5e693fbed2..06cd7a1b2e 100755
--- a/.gitlab/scripts/unittest.sh
+++ b/.gitlab/scripts/unittest.sh
@@ -1,6 +1,4 @@
 #!/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-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
+time cargo test
diff --git a/.gitlab/scripts/windows.sh b/.gitlab/scripts/windows.sh
index ff395e0016..1f3a2d967b 100755
--- a/.gitlab/scripts/windows.sh
+++ b/.gitlab/scripts/windows.sh
@@ -1,6 +1,5 @@
 #!/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
+time cargo build --target=x86_64-pc-windows-gnu --release --no-default-features --features default-publish