From 2bab4b0afbcecfd698fddc9c5d16d0728b056112 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 27 Apr 2017 22:34:04 +0200 Subject: [PATCH] Uninstalling Rust on Travis requires something different --- .travis.yml | 4 ++++ ci/install.sh | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1111c4e..3bab5b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,10 @@ matrix: rust: nightly env: TARGET=x86_64-unknown-linux-gnu + - os: linux + rust: stable + env: TARGET=x86_64-unknown-linux-gnu + allow_failures: # TODO You might need to allow failures for some target on some channel for some reason. Below # there's one (commented out) example of how to do that. Just change the OS, channel and TARGET diff --git a/ci/install.sh b/ci/install.sh index 3b3f28d..a4d8c7b 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -17,9 +17,6 @@ install_c_toolchain() { } install_rustup() { - # uninstall the rust toolchain installed by travis, we are going to use rustup - sh ~/rust/lib/rustlib/uninstall.sh - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=$TRAVIS_RUST_VERSION rustc -V