Auto merge of #4668 - lzutao:update-rtim, r=flip1995

 build: switch back to latest official RTIM release

Closes #4666

changelog: none

3 files changed, 25 insertions, 21 deletions

diff --git a/.travis.yml b/.travis.yml
index 13ffb09a686..59e384cfaf3 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')
@@ -107,13 +107,16 @@ 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
+
+script:
   - |
     if [ -z ${INTEGRATION} ]; then
       travis_wait 30 ./ci/base-tests.sh && sleep 5
@@ -121,14 +124,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
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..b8311660689 100755
--- a/setup-toolchain.sh
+++ b/setup-toolchain.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
 # Set up the appropriate rustc toolchain
 
+set -e
+
 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