From 627ca6b57857de8967cb857e04283d92a28dd9ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Tue, 30 Oct 2018 15:41:59 +0100 Subject: [PATCH 1/3] Revert "Disable rust master toolchain build temporarily" This reverts commit 0d899562cd805bd4335d6ee8d88e2bf1f743f000. --- .travis.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3f8c116607..09972a12f8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,14 +75,13 @@ matrix: - os: windows script: - # uncomment once https://github.com/rust-lang/rust/issues/55376 is fixed - # - | - # rm rust-toolchain - # cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed" - # RUSTC_HASH=$(git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}') - # travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH - # rustup default master - # export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib + - | + rm rust-toolchain + cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed" + RUSTC_HASH=$(git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}') + travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH + rustup default master + export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib - | if [ -z ${INTEGRATION} ]; then ./ci/base-tests.sh && sleep 5 From 9b0f767b43a8f67bc22355b72799358ee79063c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Tue, 30 Oct 2018 15:42:15 +0100 Subject: [PATCH 2/3] Revert "appveyor: use rustc nightly instead of master" This reverts commit 3f0161918871403b4e0547191a93f395b8bf5b35. --- appveyor.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 18f25e916f3..fb0b326c713 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,12 +20,11 @@ install: - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin - git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}' >rustc-hash.txt - set /p RUSTC_HASH= Date: Tue, 30 Oct 2018 15:58:35 +0100 Subject: [PATCH 3/3] Revert "travis: work around temporary test failure due to rustc crashing on hyper." This reverts commit 326270ad1221b54028f9d029881fa0b1fb742db9. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09972a12f8d..75b45c9db40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,8 +63,7 @@ matrix: - env: INTEGRATION=chronotope/chrono - env: INTEGRATION=serde-rs/serde - env: INTEGRATION=Geal/nom -# uncomment once https://github.com/rust-lang/rust/issues/55376 is fixed -# - env: INTEGRATION=hyperium/hyper + - env: INTEGRATION=hyperium/hyper allow_failures: - os: windows env: BASE_TEST=true