From a89c610a0f4a1d04d71abfaf031de533c2975779 Mon Sep 17 00:00:00 2001 From: "Justin R. Miller" Date: Mon, 18 Aug 2014 11:52:16 -0700 Subject: refs #431: bring back Travis Bash strictness --- ios/mapbox-gl-cocoa | 2 +- scripts/travis_before_install.sh | 3 +++ scripts/travis_script.sh | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ios/mapbox-gl-cocoa b/ios/mapbox-gl-cocoa index 3289cb9bd7..e1c709a8de 160000 --- a/ios/mapbox-gl-cocoa +++ b/ios/mapbox-gl-cocoa @@ -1 +1 @@ -Subproject commit 3289cb9bd7528279d01ea81a2342205210c6832c +Subproject commit e1c709a8de0b69aa6bfbcd9ea4faf981b6e799b2 diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 0827f98438..e9b3384dec 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -1,5 +1,8 @@ #!/usr/bin/env bash +set -e +set -o pipefail + if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then # # install Linux dependencies diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh index 8127083835..61c2e52059 100755 --- a/scripts/travis_script.sh +++ b/scripts/travis_script.sh @@ -1,5 +1,8 @@ #!/usr/bin/env bash +set -e +set -o pipefail + if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then # # build & test Linux @@ -11,7 +14,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then ${TEST} done cd ../.. - (cd ./node_modules/mapbox-gl-test-suite/ && (./bin/compare_images.js; ./bin/deploy_results.sh)) + (cd ./node_modules/mapbox-gl-test-suite/ && (./bin/compare_images.js || true; ./bin/deploy_results.sh)) elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then # # build OS X -- cgit v1.2.1