Use CI caching and cargo feature install-upgrade

* do not force to install rustfmt
* use cargo-cache
* disable bash trace
* clone single branch

Author: tesuji

.github/deploy.sh

@@ -13,11 +13,7 @@ SSH_REPO=${REPO/https:\/\/github.com\//[email protected]:}
 SHA=$(git rev-parse --verify HEAD)
 
 # Clone the existing gh-pages for this repo into out/
-(
-    git clone "$REPO" out
-    cd out
-    git checkout $TARGET_BRANCH
-)
+git clone -q --single-branch --branch "$TARGET_BRANCH" "$REPO" out
 
 echo "Removing the current docs for master"
 rm -rf out/master/ || exit 0

.travis.yml

@@ -14,6 +14,13 @@ branches:
     - trying.tmp
     - staging.tmp
 
+cache:
+  directories:
+    - $HOME/.cargo
+before_cache:
+  - cargo install -Z install-upgrade cargo-cache --debug
+  - cargo cache --autoclean
+
 env:
  global:
    - RUST_BACKTRACE=1
@@ -22,7 +29,12 @@ env:
 install:
   - |
     if [ -z ${INTEGRATION} ]; then
-      rustup component add rustfmt || cargo install --git https://github.com/rust-lang/rustfmt/ --force
+      if ! rustup component add rustfmt; then
+        cargo install \
+          -Z install-upgrade \
+          --git https://github.com/rust-lang/rustfmt \
+          --bin rustfmt
+      fi
       if [ "$TRAVIS_OS_NAME" == "linux" ]; then
         . $HOME/.nvm/nvm.sh
         nvm install stable
@@ -122,13 +134,10 @@ script:
     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"
     fi
-    set +e
   fi

appveyor.yml

@@ -13,12 +13,18 @@ branches:
       - auto
       - try
 
+cache:
+    - '%USERPROFILE%\.cargo'
+on_finish:
+    - cargo install -Z install-upgrade cargo-cache --debug
+    - cargo cache --autoclean
+
 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
     - del rust-toolchain
-    - cargo install --git https://github.com/kennytm/rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed"
+    - cargo install -Z install-upgrade --git https://github.com/kennytm/rustup-toolchain-install-master --bin rustup-toolchain-install-master --debug
     - rustup-toolchain-install-master -f -n master -c rustc-dev
     - rustup component add rustfmt --toolchain nightly & exit 0 # Format test handles missing rustfmt
     - rustup default master

setup-toolchain.sh

@@ -5,6 +5,7 @@ cd "$(dirname "$0")" || exit
 
 if ! command -v rustup-toolchain-install-master > /dev/null; then
   cargo install \
+    -Z install-upgrade \
     --git https://github.com/kennytm/rustup-toolchain-install-master \
     --bin rustup-toolchain-install-master \
     --debug