From f3cb08170c5e0a12d2a9f267f2a1c80a4ef15b8d Mon Sep 17 00:00:00 2001
From: Imbris <imbrisf@gmail.com>
Date: Thu, 3 Jun 2021 14:24:31 -0400
Subject: [PATCH] Unhack the wgpu branch CI

---
 .gitlab-ci.yml                 |  8 ++++----
 .gitlab/CI/build.gitlab-ci.yml | 28 ++++++++++++++--------------
 .gitlab/CI/check.gitlab-ci.yml | 16 ++++++++--------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d4b1df340..9590b819bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ variables:
   # Note: this is deprecated!
   # ttps://docs.gitlab.com/ee/ci/yaml/#shallow-cloning
   GIT_DEPTH: 3
-  GIT_CLEAN_FLAGS: -n
+  GIT_CLEAN_FLAGS: -f
   CACHE_IMAGE_TAG: 7ea40612
 
 default:
@@ -25,7 +25,7 @@ default:
       - runner_system_failure
       - stuck_or_timeout_failure
   tags:
-    - veloren-wgpu-docker
+    - veloren-docker
 
 # NOTE: overriden for the `.tmacos` template so relevant changes need to be mirrored there
 before_script:
@@ -36,9 +36,9 @@ before_script:
   - 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 SHADERC_LIB_DIR=/shaderc/combined/
-    #- rm -rf target || echo "it seems that sometimes OLD data is left over"
+  - rm -rf target || echo "it seems that sometimes OLD data is left over"
 
 # 8866215 is the user that is used to sync data to the collaboration repos
 workflow:
diff --git a/.gitlab/CI/build.gitlab-ci.yml b/.gitlab/CI/build.gitlab-ci.yml
index 786bef9be3..8308b67fc8 100644
--- a/.gitlab/CI/build.gitlab-ci.yml
+++ b/.gitlab/CI/build.gitlab-ci.yml
@@ -1,17 +1,17 @@
-# unittests:
-#   extends: .recompile-branch
-#   stage: build
-#   image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
-#   variables:
-#     GIT_DEPTH: 9999999999999
-#   script:
-#     - ln -s /dockercache/target target
-#     - rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
-#     - cargo test --package veloren-i18n --lib test_all_localizations -- --nocapture --ignored
-#     - rm -r target/debug/incremental* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
-#     - cargo test
-#   retry:
-#     max: 2
+unittests:
+  extends: .recompile-branch
+  stage: build
+  image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
+  variables:
+    GIT_DEPTH: 9999999999999
+  script:
+    - ln -s /dockercache/target target
+    - rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
+    - cargo test --package veloren-i18n --lib test_all_localizations -- --nocapture --ignored
+    - rm -r target/debug/incremental* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
+    - cargo test
+  retry:
+    max: 2
 
 benchmarks:
   extends: .post-merge
diff --git a/.gitlab/CI/check.gitlab-ci.yml b/.gitlab/CI/check.gitlab-ci.yml
index 51c8642b2a..a26a4caf8e 100644
--- a/.gitlab/CI/check.gitlab-ci.yml
+++ b/.gitlab/CI/check.gitlab-ci.yml
@@ -9,11 +9,11 @@ code-quality:
     - cargo clippy --all-targets --locked -- -D warnings
     - cargo fmt --all -- --check
 
-# security:
-#   extends: .recompile-branch
-#   stage: check
-#   image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
-#   allow_failure: true
-#   script:
-#     - ln -s /dockercache/target target
-#     - cargo audit
+security:
+  extends: .recompile-branch
+  stage: check
+  image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
+  allow_failure: true
+  script:
+    - ln -s /dockercache/target target
+    - cargo audit