From a081f646871cacc089c404bd372a72271f3b8d18 Mon Sep 17 00:00:00 2001
From: Forest Anderson <forestkzanderson@gmail.com>
Date: Sat, 6 Jul 2019 18:03:29 +0000
Subject: [PATCH] Fix CI problems

---
 .gitlab-ci.yml | 6 ++++--
 rust-toolchain | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1843c91421..809a8587dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,6 +33,7 @@ before_script:
   - git lfs fetch;
   - git lfs checkout;
   - git status
+  - rustup -v show
   - if [ -d target ]; then
       ls -la target;
     fi;
@@ -102,14 +103,15 @@ clean-code:
 #     - cargo tarpaulin --all
 #   allow_failure: true
 
+# For now, Clippy will just care about performance improvements as much of the
+# codebase is not in a place that cleaning warnings will be benificial
 clippy:
   stage: post-build
   image: registry.gitlab.com/veloren/veloren-docker-ci
   tags:
     - veloren-docker
   script:
-    - cargo clippy --all -- -D clippy || echo "This job is disabled, because we are not activly using it now, so we dont want to see yellow failed partly"
-  allow_failure: true
+    - cargo clippy -- -W clippy::all
 
 #############
 # Commit build
diff --git a/rust-toolchain b/rust-toolchain
index bf867e0ae5..05f8d76601 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly
+nightly-2019-07-03