diff --git a/.gitlab/CI/build.gitlab-ci.yml b/.gitlab/CI/build.gitlab-ci.yml index 1920835314..fbac963116 100644 --- a/.gitlab/CI/build.gitlab-ci.yml +++ b/.gitlab/CI/build.gitlab-ci.yml @@ -5,6 +5,7 @@ unittests: GIT_DEPTH: 9999999999999 script: - ln -s /dockercache/cache-all target + - rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly - cargo test --package veloren-voxygen --lib test_all_localizations -- --nocapture --ignored - cargo test retry: @@ -18,7 +19,10 @@ benchmarks: script: - unset DISABLE_GIT_LFS_CHECK - ln -s /dockercache/cache-all target - - cargo bench + - ls -la target/* + - rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly + - rm -r target/release/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly + - cargo bench || exit 0 #temp fix - TAGUUID="Z$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1)" || echo "ignore this returncode, dont ask me why, it works" - echo $TAGUUID - echo 'SET veloren.timestamp = "'"$(git show --no-patch --no-notes --pretty='%cd' HEAD)"'";' > upload.sql @@ -37,6 +41,7 @@ coverage: stage: build script: - ln -s /dockercache/cache-tarpaulin target + - 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; @@ -48,6 +53,7 @@ coverage: .tlinux: script: - ln -s /dockercache/cache-release-linux target + - rm -r target/release/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly - VELOREN_USERDATA_STRATEGY=executable cargo build --release - cp -r target/release/veloren-server-cli $CI_PROJECT_DIR - cp -r target/release/veloren-voxygen $CI_PROJECT_DIR @@ -62,6 +68,7 @@ coverage: .twindows: script: - ln -s /dockercache/cache-release-windows target + - rm -r target/release/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly - VELOREN_USERDATA_STRATEGY=executable cargo build --target=x86_64-pc-windows-gnu --release - cp -r target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe $CI_PROJECT_DIR - cp -r target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe $CI_PROJECT_DIR @@ -76,6 +83,7 @@ coverage: .tmacos: script: - ln -s /dockercache/cache-release-macos target + - rm -r target/release/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly - VELOREN_USERDATA_STRATEGY=executable WINIT_LINK_COLORSYNC=true PATH="/dockercache/osxcross/target/bin:$PATH" COREAUDIO_SDK_PATH=/dockercache/osxcross/target/SDK/MacOSX10.13.sdk CC=o64-clang CXX=o64-clang++ cargo build --target x86_64-apple-darwin --release - cp -r target/x86_64-apple-darwin/release/veloren-server-cli $CI_PROJECT_DIR - cp -r target/x86_64-apple-darwin/release/veloren-voxygen $CI_PROJECT_DIR diff --git a/.gitlab/CI/check.gitlab-ci.yml b/.gitlab/CI/check.gitlab-ci.yml index 0459d2ecc3..171f72dbc5 100644 --- a/.gitlab/CI/check.gitlab-ci.yml +++ b/.gitlab/CI/check.gitlab-ci.yml @@ -4,6 +4,7 @@ code-quality: stage: check script: - ln -s /dockercache/cache-all target + - rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly - cargo clippy --all-targets --locked -- -D warnings - cargo fmt --all -- --check