diff --git a/.travis.yml b/.travis.yml index 7528cb4d07..71acda37d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,8 @@ env: before_script: - ./dev/bots/travis_setup.sh script: - - (./bin/cache/dart-sdk/bin/dart ./dev/bots/test.dart && ./dev/bots/travis_upload.sh) + # TODO(tvolkert): Re-enable `&& ./dev/bots/travis_upload.sh` + - (./bin/cache/dart-sdk/bin/dart ./dev/bots/test.dart) cache: directories: - $HOME/.pub-cache diff --git a/dev/bots/travis_setup.sh b/dev/bots/travis_setup.sh index 89a30db5b8..d6d5da0013 100755 --- a/dev/bots/travis_setup.sh +++ b/dev/bots/travis_setup.sh @@ -5,10 +5,11 @@ echo $KEY_FILE | base64 --decode > ../gcloud_key_file.json set -x -if [ -n "$TRAVIS" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then - export CLOUDSDK_CORE_DISABLE_PROMPTS=1 - curl https://sdk.cloud.google.com | bash -fi +# TODO(tvolkert): Re-enable once this is able to successfully run on Travis +#if [ -n "$TRAVIS" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then +# export CLOUDSDK_CORE_DISABLE_PROMPTS=1 +# curl https://sdk.cloud.google.com | bash +#fi # disable analytics on the bots and download Flutter dependencies ./bin/flutter config --no-analytics diff --git a/dev/bots/travis_upload.sh b/dev/bots/travis_upload.sh index 7201dfd426..595ff8c9b3 100755 --- a/dev/bots/travis_upload.sh +++ b/dev/bots/travis_upload.sh @@ -6,7 +6,10 @@ export PATH="$PWD/bin:$PWD/bin/cache/dart-sdk/bin:$PATH" LCOV_FILE=./packages/flutter/coverage/lcov.info -if [ "$SHARD" = "coverage" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ -f "$LCOV_FILE" ]; then +if [ "$SHARD" = "coverage" ] && \ + [ "$TRAVIS_PULL_REQUEST" = "false" ] && \ + [ "$TRAVIS_BRANCH" = "master" ] && \ + [ -f "$LCOV_FILE" ]; then GSUTIL=$HOME/google-cloud-sdk/bin/gsutil GCLOUD=$HOME/google-cloud-sdk/bin/gcloud