travis: ensure consistent toolchain between local and CI

ah- · Feb 22, 2019 · 7aef8e0 · 7aef8e0
1 parent 8e5d104
commit 7aef8e0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: rust
-rust: nightly-2018-12-06
+rust: nightly-2019-02-22
 os:
   - linux
   - osx
@@ -26,6 +26,13 @@ before_install:
       echo "Only docs were updated, stopping build process."
       exit
     fi
+- |
+    rust_toolchain="$(cat rust-toolchain)"
+    travis_yml="$(grep '^rust: ' .travis.yml | head -n 1 | sed -E 's/^rust: //')"
+    if [[ $travis_yml != $rust_toolchain ]]; then
+      echo "error: the nightly version in $1 is different than the one in rust-toolchain!" 1>&2
+      exit 1
+    fi
 
 install:
   - bash ./scripts/install.sh

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2019-01-01
+nightly-2019-02-22