From 27f0d860685a2131ed6f04a1ccd49cdcecdc4096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Thu, 4 Jul 2019 17:28:15 +0300
Subject: [PATCH] Run stable clippy in gitlab CI again and also build all
 features on stable

Now that futures are stable in 1.36 we can do that again.
---
 .gitlab-ci.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1412f1c70..e95ee8e8b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,7 +49,7 @@ stages:
     - G_DEBUG=fatal_warnings cargo test --color=always --all
 
     - |
-      if [ -n "$NIGHTLY" ]; then
+      if [ -n "$ALL_FEATURES" ]; then
         cargo build --color=always --all --all-features
         G_DEBUG=fatal_warnings cargo test --color=always --all --all-features
       fi
@@ -64,6 +64,8 @@ test stable:
   # Stable img
   # https://hub.docker.com/_/rust/
   image: "rust:slim"
+  variables:
+    ALL_FEATURES: 'yes'
   extends: '.cargo test'
 
 test nightly:
@@ -72,7 +74,7 @@ test nightly:
   image: "rustlang/rust:nightly-slim"
   allow_failure: true
   variables:
-    NIGHTLY: 'yes'
+    ALL_FEATURES: 'yes'
   extends: '.cargo test'
 
 rustfmt:
@@ -85,7 +87,7 @@ rustfmt:
 
 clippy:
   extends: '.tarball_setup'
-  image: "rustlang/rust:nightly-slim"
+  image: "rust:slim"
   stage: 'extras'
   allow_failure: true
   script: