From a91870ffe1704bc9f87a3b7abefd70042df86b8a Mon Sep 17 00:00:00 2001
From: holygits <beauchjord@gmail.com>
Date: Thu, 29 Aug 2019 16:32:32 +1200
Subject: [PATCH] fixed #6

---
 .circleci/config.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dd33d270..94e3e170 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,6 @@ commands:
             if [ ! -d /home/circleci/.cargo ]; then
               curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
             fi
-            source $HOME/.cargo/env
             rustup toolchain install $RUST_VERSION
             rustup default $RUST_VERSION
             rustup target add wasm32-unknown-unknown --toolchain=$RUST_VERSION
@@ -22,12 +21,7 @@ commands:
       - run:
           name: Install sccache
           command: |
-            source $HOME/.cargo/env
             cargo install sccache
-            # Rust use sccache.
-            echo 'export "RUSTC_WRAPPER"="sccache"' >> $BASH_ENV
-            # max. space sccache will use on disk.
-            echo 'export "SCCACHE_CACHE_SIZE"="10G"' >> $BASH_ENV
             sccache --version
   restore-cache:
     steps:
@@ -50,16 +44,22 @@ jobs:
     machine:
       image: ubuntu-1604:201903-01
     environment:
+      BASH_ENV: ~/.cargo/env
       RUST_VERSION: nightly-2019-07-14
+      RUSTC_WRAPPER: sccache
+      SCCACHE_CACHE_SIZE: 10G
     steps:
       - checkout
       - install-rust
+      # sccache needs to build too
+      # Could manually unpack and install a release here instead
+      - restore-cache
       - install-sccache
+      - save-cache
       - restore-cache
       - run:
           name: Build binary
           command: |
-            source $HOME/.cargo/env
             cargo build
           no_output_timeout: 40m
       - save-cache
@@ -67,7 +67,6 @@ jobs:
       - run:
           name: Build tests
           command: |
-            source $HOME/.cargo/env
             cargo test --all --no-run
           no_output_timeout: 40m
       - save-cache
@@ -75,6 +74,5 @@ jobs:
       - run:
           name: Run tests
           command: |
-            source $HOME/.cargo/env
             cargo test --all
           no_output_timeout: 40m