From 0539c9de74144d1f2e045e097ab871d0419f3eda Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 5 Jan 2023 21:19:20 -0500 Subject: [PATCH] Temp --- .gitlab/CI/build.gitlab-ci.yml | 2 +- .gitlab/scripts/env.sh | 2 +- .gitlab/scripts/windows-x86_64.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab/CI/build.gitlab-ci.yml b/.gitlab/CI/build.gitlab-ci.yml index fc7684b355..574c352154 100644 --- a/.gitlab/CI/build.gitlab-ci.yml +++ b/.gitlab/CI/build.gitlab-ci.yml @@ -132,7 +132,7 @@ coverage: - export DISABLE_GIT_LFS_CHECK=true - export VELOREN_ASSETS="$(pwd)/assets" - echo "VELOREN_ASSETS=$VELOREN_ASSETS" - - export RUSTFLAGS="-D warnings" + # - export RUSTFLAGS="-D warnings" - export CARGO_INCREMENTAL=0 .tmacos: diff --git a/.gitlab/scripts/env.sh b/.gitlab/scripts/env.sh index 7241ab322c..857d8f4128 100644 --- a/.gitlab/scripts/env.sh +++ b/.gitlab/scripts/env.sh @@ -4,6 +4,6 @@ export DISABLE_GIT_LFS_CHECK=true export VELOREN_ASSETS="assets" # When updating RUSTFLAGS here, windows-x86_64.sh must also be updated as it sets them independently -export RUSTFLAGS="-D warnings" +# export RUSTFLAGS="-D warnings" export SHADERC_LIB_DIR=/shaderc/combined/ diff --git a/.gitlab/scripts/windows-x86_64.sh b/.gitlab/scripts/windows-x86_64.sh index b72594f907..503729d636 100755 --- a/.gitlab/scripts/windows-x86_64.sh +++ b/.gitlab/scripts/windows-x86_64.sh @@ -6,6 +6,6 @@ export VELOREN_USERDATA_STRATEGY=executable # RUSTFLAGS is set here in addition to env.sh (which is used for all targets not just windows) due to # https://github.com/rust-lang/cargo/issues/5376 which prevents the windows-specific rustflags set in # .cargo/config from being applied -export RUSTFLAGS="-D warnings -C link-arg=-lpsapi" +export RUSTFLAGS="-C link-arg=-lpsapi" time cargo build --target=x86_64-pc-windows-gnu --release --no-default-features --features default-publish