From 7a9cf68381d32d567762a91ef9ab6d8461f285bc Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Tue, 30 Oct 2018 04:28:19 +0000
Subject: [PATCH] Reenable master build, unbreak CI

---
 .travis.yml  | 18 +++++++++---------
 appveyor.yml | 22 +++++++++++-----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d3f8c116607b..cb8ba8fbc721 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: rust
 
-rust: nightly
+# change to nightly when https://github.com/rust-lang/rust/issues/55376 is fixed
+rust: nightly-2018-10-20
 
 os:
   - linux
@@ -75,14 +76,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
diff --git a/appveyor.yml b/appveyor.yml
index 18f25e916f3f..756de28b19d8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,17 +15,17 @@ branches:
         - staging.tmp
 
 install:
-    - curl -sSf -o rustup-init.exe https://win.rustup.rs/
-    - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly
-    - 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=<rustc-hash.txt
-# uncomment once https://github.com/rust-lang/rust/issues/55376 is fixed
-#    - del rust-toolchain
-#    - cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
-#    - rustup-toolchain-install-master %RUSTC_HASH% -f -n master
-#    - rustup default master
-#    - set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin
+   - curl -sSf -o rustup-init.exe https://win.rustup.rs/
+   # change to nightly when https://github.com/rust-lang/rust/issues/55376 is fixed
+   - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly-2018-10-20
+   - 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=<rustc-hash.txt
+   - del rust-toolchain
+   - cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
+   - rustup-toolchain-install-master %RUSTC_HASH% -f -n master
+   - rustup default master
+   - set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin
     - rustc -V
     - cargo -V