diff options
| -rw-r--r-- | .travis.yml | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index 8f9c5e8f636..66dcf7d7277 100644 --- a/.travis.yml +++ b/.travis.yml @@ -107,13 +107,13 @@ 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 - | if [ -z ${INTEGRATION} ]; then travis_wait 30 ./ci/base-tests.sh && sleep 5 @@ -121,14 +121,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 |