From 02dcd629ae98ee1fa6136ce7ab70bbc5b7f24853 Mon Sep 17 00:00:00 2001
From: Lzu Tao <taolzu@gmail.com>
Date: Tue, 15 Oct 2019 00:45:48 +0700
Subject: [PATCH 1/4] build: switch back to latest official RTIM release

---
 appveyor.yml       | 2 +-
 setup-toolchain.sh | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 62fd7825ed9..c13bf711ae3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,7 +18,7 @@ install:
     - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly
     - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
     - del rust-toolchain
-    - cargo install --git https://github.com/kennytm/rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed"
+    - cargo install rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed"
     - rustup-toolchain-install-master -f -n master
     - rustup component add rustfmt --toolchain nightly & exit 0 # Format test handles missing rustfmt
     - rustup default master
diff --git a/setup-toolchain.sh b/setup-toolchain.sh
index 49278a9137d..f2bf291f0b0 100755
--- a/setup-toolchain.sh
+++ b/setup-toolchain.sh
@@ -5,8 +5,7 @@ cd "$(dirname "$0")" || exit
 
 if ! command -v rustup-toolchain-install-master > /dev/null; then
   cargo install \
-    --git https://github.com/lzutao/rustup-toolchain-install-master \
-    --rev c44dbf920b644000ac3ba01184cbb1a01bb91519 \
+    rustup-toolchain-install-master \
     --bin rustup-toolchain-install-master \
     --debug
 fi

From f4ea5251cb0205ca0a3ed2ac5eb295ec6f7f031c Mon Sep 17 00:00:00 2001
From: Lzu Tao <taolzu@gmail.com>
Date: Tue, 15 Oct 2019 00:51:41 +0700
Subject: [PATCH 2/4] Early exit if there is any errors

---
 setup-toolchain.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup-toolchain.sh b/setup-toolchain.sh
index f2bf291f0b0..b8311660689 100755
--- a/setup-toolchain.sh
+++ b/setup-toolchain.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 # Set up the appropriate rustc toolchain
 
+set -e
+
 cd "$(dirname "$0")" || exit
 
 if ! command -v rustup-toolchain-install-master > /dev/null; then

From 63a4cd60cde961b050d20ba2f891c8a581b141ed Mon Sep 17 00:00:00 2001
From: Lzu Tao <taolzu@gmail.com>
Date: Tue, 15 Oct 2019 00:56:27 +0700
Subject: [PATCH 3/4] build: do not trace deploy step

---
 .travis.yml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8f9c5e8f636..66dcf7d7277 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -107,13 +107,13 @@ script:
       fi
     fi
   - |
-      rm rust-toolchain
-      ./setup-toolchain.sh
-      if [ "$TRAVIS_OS_NAME" == "windows" ]; then
-        export PATH=$PATH:$(rustc --print sysroot)/bin
-      else
-        export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
-      fi
+    rm rust-toolchain
+    ./setup-toolchain.sh
+    if [ "$TRAVIS_OS_NAME" == "windows" ]; then
+      export PATH=$PATH:$(rustc --print sysroot)/bin
+    else
+      export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
+    fi
   - |
     if [ -z ${INTEGRATION} ]; then
       travis_wait 30 ./ci/base-tests.sh && sleep 5
@@ -121,14 +121,14 @@ script:
       ./ci/integration-tests.sh && sleep 5
     fi
 
-after_success: |
-  #!/bin/bash
-  if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-    set -ex
-    if [ -z ${INTEGRATION} ]; then
-      ./.github/deploy.sh
-    else
-      echo "Not deploying, because we're in an integration test run"
+after_success:
+  - |
+    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+      set -e
+      if [ -z ${INTEGRATION} ]; then
+        ./.github/deploy.sh
+      else
+        echo "Not deploying, because we're in an integration test run"
+      fi
+      set +e
     fi
-    set +e
-  fi

From 0b39946b20eb892e569c4f42c5c9d569209b33b2 Mon Sep 17 00:00:00 2001
From: Lzu Tao <taolzu@gmail.com>
Date: Tue, 15 Oct 2019 01:21:25 +0700
Subject: [PATCH 4/4] travis: break out before_script stage to test
 setup-toolchain work

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 66dcf7d7277..9934e3bd47f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,7 +91,7 @@ matrix:
     - os: osx
     - os: windows
 
-script:
+before_script:
   - |
     if [ "$TRAVIS_BRANCH" == "auto" ] || [ "$TRAVIS_BRANCH" == "try" ]; then
       pr=$(echo $TRAVIS_COMMIT_MESSAGE | grep -o "#[0-9]*" | head -1 | sed 's/^#//g')
@@ -109,11 +109,14 @@ script:
   - |
     rm rust-toolchain
     ./setup-toolchain.sh
+  - |
     if [ "$TRAVIS_OS_NAME" == "windows" ]; then
       export PATH=$PATH:$(rustc --print sysroot)/bin
     else
       export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
     fi
+
+script:
   - |
     if [ -z ${INTEGRATION} ]; then
       travis_wait 30 ./ci/base-tests.sh && sleep 5