From ba3c27322f40e0634a569eaba1bac4f10ea76dff Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Wed, 14 Feb 2018 22:40:19 +0100
Subject: [PATCH] ensure nightly in rustup

---
 Makefile                    | 1 +
 scripts/circleci-install.sh | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 24f235c..48d51c9 100644
--- a/Makefile
+++ b/Makefile
@@ -145,6 +145,7 @@ ssh-submodule-urls:
 
 install-rust:
 	curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly
+	rustup update nightly
 
 rust-ext:
 	[ "$$READTHEDOCS" != "True" ] || $(MAKE) install-rust
diff --git a/scripts/circleci-install.sh b/scripts/circleci-install.sh
index 759039b..b05d326 100644
--- a/scripts/circleci-install.sh
+++ b/scripts/circleci-install.sh
@@ -1,12 +1,15 @@
-make install-rust
 echo "export PATH=$HOME/.cargo/bin/:$PATH" >> $BASH_ENV
+. $BASH_ENV
 
+make install-rust
 sudo apt-get install -y cmake
 
 pip install --user virtualenv
 ~/.local/bin/virtualenv ~/env
+
 echo ". ~/env/bin/activate" >> $BASH_ENV
 . $BASH_ENV
+
 pip install docker-compose
 
 make -e install-dev install-test