diff options
| author | Justin R. Miller <incanus@users.noreply.github.com> | 2014-08-18 12:12:25 -0700 |
|---|---|---|
| committer | Justin R. Miller <incanus@users.noreply.github.com> | 2014-08-18 12:12:25 -0700 |
| commit | dbf6d7bcb5502ab7529a0b9b7bfd59c2d2e10944 (patch) | |
| tree | 43e46089fe94049a0a6e1d0875d5b0862c7d7b4d | |
| parent | de72cf45afe6386bc9c798fb776fbdb708a62131 (diff) | |
| parent | a89c610a0f4a1d04d71abfaf031de533c2975779 (diff) | |
| download | qtlocation-mapboxgl-dbf6d7bcb5502ab7529a0b9b7bfd59c2d2e10944.tar.gz | |
Merge pull request #432 from mapbox/travis-bash-strict
refs #431: bring back Travis Bash strictness
| m--------- | ios/mapbox-gl-cocoa | 0 | ||||
| -rwxr-xr-x | scripts/travis_before_install.sh | 3 | ||||
| -rwxr-xr-x | scripts/travis_script.sh | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/ios/mapbox-gl-cocoa b/ios/mapbox-gl-cocoa -Subproject 3289cb9bd7528279d01ea81a2342205210c6832 +Subproject e1c709a8de0b69aa6bfbcd9ea4faf981b6e799b 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 |