From e7dac1e3f39be915b7d7340f3136d25de3423d9d Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 28 Jan 2023 13:55:49 -0500 Subject: [PATCH] Revert hacks to CI --- .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 574c352154..fc7684b355 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 857d8f4128..7241ab322c 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 503729d636..b72594f907 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="-C link-arg=-lpsapi" +export RUSTFLAGS="-D warnings -C link-arg=-lpsapi" time cargo build --target=x86_64-pc-windows-gnu --release --no-default-features --features default-publish