Merge pull request #1776 from lzutao/shellcheck

Enable shellcheck and fold Travis log

Author: kinnison

.travis.yml

@@ -1,10 +1,14 @@
-sudo: required
-dist: trusty
+dist: xenial
 services:
   - docker
 language: rust
 
+git:
+  depth: false
+  quiet: true
+
 matrix:
+  fast_finish: true
   include:
     # Linux builds use the `rust-slave-dist` image so we link them against a
     # "super old glibc" to ensure that it runs on as many platforms as possible.
@@ -46,16 +50,16 @@ matrix:
       os: osx
       osx_image: xcode9.2
       if: branch != master
-      env: MACOSX_DEPLOYMENT_TARGET=10.7 TARGET=i686-apple-darwin
-    - <<: *mac
       env: MACOSX_DEPLOYMENT_TARGET=10.7 TARGET=x86_64-apple-darwin NO_ADD=1
+    - <<: *mac
+      env: MACOSX_DEPLOYMENT_TARGET=10.7 TARGET=i686-apple-darwin
 
 install:
-  - if [ -z "$NO_ADD" ]; then rustup target add $TARGET; fi
+  - if [ -z "$NO_ADD" ]; then rustup target add "$TARGET"; fi
   - rustup component add rustfmt
 
 script:
-  - mkdir -p target/$TARGET;
+  - mkdir -p target/"$TARGET";
   - >
       case "$TARGET" in
         *-linux-android)     DOCKER=android ;; # Android uses a local docker image
@@ -68,9 +72,12 @@ script:
       else
           PATH="$HOME/rust/bin:$PATH" sh ci/run.sh;
       fi
+  - if [ "${TRAVIS_OS_NAME}" = linux ]; then
+      shellcheck -s dash -e SC1090 -- rustup-init.sh ci/*.sh;
+    fi
 
 before_deploy:
-  - bash ci/prepare-deploy-travis.sh
+  - sh ci/prepare-deploy-travis.sh
 
 deploy:
   - provider: s3

ci/build-run-docker.sh

@@ -1,20 +1,35 @@
 #!/bin/bash
 
-set -ex
+script_dir=$(cd "$(dirname "$0")" && pwd)
+. "$script_dir/shared.sh"
+
+set -e
+# Disable cause it makes shared script not to work properly
+#set -x
 
 mkdir -p target
 
 DOCKER="$1"
 TARGET="$2"
 SKIP_TESTS="$3"
 
-bash ci/fetch-rust-docker.sh "$TARGET"
+travis_fold start "fetch.image.${TARGET}"
+travis_time_start
+travis_do_cmd sh ci/fetch-rust-docker.sh "$TARGET"
+travis_time_finish
+travis_fold end "fetch.image.${TARGET}"
+
 if [ -f "ci/docker/$DOCKER/Dockerfile" ]; then
-  docker build -t "$DOCKER" "ci/docker/$DOCKER/"
+  travis_fold start "build.Dockerfile.${DOCKER}"
+  travis_time_start
+  travis_do_cmd docker build -t "$DOCKER" "ci/docker/$DOCKER/"
+  travis_time_finish
+  travis_fold end "build.Dockerfile.${DOCKER}"
 fi
 
+# shellcheck disable=SC2016
 docker run \
-  --entrypoint bash \
+  --entrypoint sh \
   --user "$(id -u)":"$(id -g)" \
   --volume "$(rustc --print sysroot)":/travis-rust:ro \
   --volume "$(pwd)":/src:ro \
@@ -25,11 +40,10 @@ docker run \
   --env CARGO_HOME=/src/target/cargo-home \
   --env CARGO_TARGET_DIR=/src/target \
   --env LIBZ_SYS_STATIC=1 \
-  --entrypoint sh \
   --tty \
   --init \
   "$DOCKER" \
-  -c 'PATH="$PATH":/travis-rust/bin exec bash ci/run.sh'
+  -c 'PATH="$PATH":/travis-rust/bin exec sh ci/run.sh'
 
 # check that rustup-init was built with ssl support
 # see https://github.com/rust-lang/rustup.rs/issues/1051

ci/fetch-rust-docker.sh

@@ -1,32 +1,17 @@
 #!/bin/bash
 
-set -ex
+script_dir=$(cd "$(dirname "$0")" && pwd)
+. "$script_dir/shared.sh"
+
+set -e
+# Disable cause it makes shared script not to work properly
+#set -x
 
 TARGET="$1"
 
 RUST_REPO="https://github.com/rust-lang/rust"
 S3_BASE_URL="https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rustc-builds"
 
-# See http://unix.stackexchange.com/questions/82598
-# Duplicated from rust-lang/rust/src/ci/shared.sh
-function retry {
-  echo "Attempting with retry:" "$@"
-  local n=1
-  local max=5
-  while true; do
-    "$@" && break || {
-      if [[ $n -lt $max ]]; then
-        sleep $n  # don't retry immediately
-        ((n++))
-        echo "Command failed. Attempt $n/$max:"
-      else
-        echo "The command has failed after $n attempts."
-        return 1
-      fi
-    }
-  done
-}
-
 # Use images from rustc master
 case "$TARGET" in
   mips-unknown-linux-gnu)          image=dist-mips-linux ;;
@@ -48,14 +33,14 @@ rm -f "$info"
 curl -o "$info" "$image_url"
 digest=$(grep -m1 ^sha "$info")
 
-if ! docker tag "$digest" "rust-$TARGET"; then
+if [ -z "$(docker images -q "rust-$TARGET")" ]; then
   url=$(grep -m1 ^https "$info")
   cache=/tmp/rustci_docker_cache
   echo "Attempting to download $url"
   rm -f "$cache"
   set +e
-  retry curl -y 30 -Y 10 --connect-timeout 30 -f -L -C - -o "$cache" "$url"
-  docker load -i "$cache"
+  travis_retry curl -y 30 -Y 10 --connect-timeout 30 -f -L -C - -o "$cache" "$url"
   set -e
+  docker load --quiet -i "$cache"
   docker tag "$digest" "rust-$TARGET"
 fi

ci/run.sh

@@ -2,8 +2,6 @@
 
 set -ex
 
-printf 'toolchain versions\n------------------\n'
-
 rustc -vV
 cargo -vV
 rustfmt -vV
@@ -18,11 +16,3 @@ fi
 # Check the formatting last because test failures are more interesting to have
 # discovered for contributors lacking some platform access for testing beforehand
 cargo fmt --all -- --check
-
-# Then check the shell scripts, if shellcheck is present (which it is on Travis CI)
-if command -v shellcheck > /dev/null 2>&1; then
-  shellcheck --version
-  shellcheck -- *.sh ci/*.sh
-else
-  echo No shellcheck found, skipping.
-fi

ci/shared.sh

@@ -0,0 +1,96 @@
+#!/bin/bash
+#
+# This file is intended to be sourced, so it is not being marked as
+# an executable file in git.
+
+# This is from
+# https://github.com/travis-ci/travis-build/blob/master/lib/travis/build/bash/travis_setup_env.bash
+travis_setup_env() {
+  export ANSI_RED='\033[31;1m'
+  export ANSI_GREEN='\033[32;1m'
+  export ANSI_YELLOW='\033[33;1m'
+  export ANSI_RESET='\033[0m'
+  export ANSI_CLEAR='\033[0K'
+}
+
+# This is from
+# https://github.com/travis-ci/travis-build/blob/master/lib/travis/build/bash/travis_fold.bash
+travis_fold() {
+  local action="${1}"
+  local name="${2}"
+  printf 'travis_fold:%s:%s\r'"${ANSI_CLEAR}" "${action}" "${name}"
+}
+
+# This is modified loop version of
+# https://github.com/travis-ci/travis-build/blob/master/lib/travis/build/bash/travis_retry.bash
+travis_retry() {
+  local result=0
+  local count=1
+  local max=5
+  while [ "${count}" -le "${max}" ]; do
+    [ "${result}" -ne 0 ] && {
+      printf "${ANSI_RED}"'The command "%s" failed. Retrying, %s of %s.'"${ANSI_RESET}"'\n' "${*}" "${count}" "${max}" >&2
+    }
+    "${@}" && { result=0 && break; } || result="${?}"
+    : $((count=count+1))
+    sleep 1
+  done
+
+  [ "${count}" -gt "${max}" ] && {
+    printf "${ANSI_RED}"'The command "%s" failed %s times.'"${ANSI_RESET}"'\n' "${*}" "${max}" >&2
+  }
+
+  return "${result}"
+}
+
+# This is from
+# https://github.com/travis-ci/travis-build/blob/master/lib/travis/build/bash/
+travis_nanoseconds() {
+  local cmd='date'
+  local format='+%s%N'
+
+  if command -v gdate >/dev/null 2>&1; then
+    cmd='gdate'
+  elif [ "$(uname)" = Darwin ]; then
+    format='+%s000000000'
+  fi
+
+  "${cmd}" -u "${format}"
+}
+
+# Generate random integer like bash's `$RANDOM`.
+travis_generate_rand() {
+  shuf -i 0-$((0xffffffff)) -n 1
+}
+
+travis_time_start() {
+  TRAVIS_TIMER_ID="$(printf '%08x' "$(travis_generate_rand)")"
+  TRAVIS_TIMER_START_TIME="$(travis_nanoseconds)"
+  export TRAVIS_TIMER_ID TRAVIS_TIMER_START_TIME
+  printf 'travis_time:start:%s\r'"${ANSI_CLEAR}" "${TRAVIS_TIMER_ID}"
+}
+
+travis_time_finish() {
+  travis_timer_end_time="$(travis_nanoseconds)"
+  local duration="$((travis_timer_end_time - TRAVIS_TIMER_START_TIME))"
+  printf '\ntravis_time:end:%s:start=%s,finish=%s,duration=%s\r'"${ANSI_CLEAR}" \
+         "${TRAVIS_TIMER_ID}" "${TRAVIS_TIMER_START_TIME}" \
+         "${travis_timer_end_time}" "${duration}"
+}
+
+travis_do_cmd() {
+  echo "$ ${*}"
+  "${@}"
+  local result="$?"
+  export TRAVIS_TEST_RESULT=$((${TRAVIS_TEST_RESULT:-0} | $((result != 0))))
+
+  if [ "${result}" -eq 0 ]; then
+    printf '%b' "${ANSI_GREEN}"
+  else
+    printf '%b' "${ANSI_RED}"
+  fi
+  printf 'The command "%s" exited with %d.'"${ANSI_RESET}"'\n' "${*}" "${result}"
+  return "$result"
+}
+
+travis_setup_env