From aa904a580a34c277c963f7b0b06ccc983517640e Mon Sep 17 00:00:00 2001 From: Todd Volkert Date: Tue, 27 Jun 2017 12:24:49 -0700 Subject: [PATCH] Re-enable coverage and docs uploading (#10995) Fixes #10940 --- .travis.yml | 3 +-- dev/bots/travis_setup.sh | 9 ++++----- dev/tools/java_and_objc_doc.dart | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 71acda37d7..7528cb4d07 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,7 @@ env: before_script: - ./dev/bots/travis_setup.sh script: - # TODO(tvolkert): Re-enable `&& ./dev/bots/travis_upload.sh` - - (./bin/cache/dart-sdk/bin/dart ./dev/bots/test.dart) + - (./bin/cache/dart-sdk/bin/dart ./dev/bots/test.dart && ./dev/bots/travis_upload.sh) cache: directories: - $HOME/.pub-cache diff --git a/dev/bots/travis_setup.sh b/dev/bots/travis_setup.sh index d6d5da0013..ce87c083d3 100755 --- a/dev/bots/travis_setup.sh +++ b/dev/bots/travis_setup.sh @@ -5,11 +5,10 @@ echo $KEY_FILE | base64 --decode > ../gcloud_key_file.json set -x -# 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 +if [ -n "$TRAVIS" ]; 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/tools/java_and_objc_doc.dart b/dev/tools/java_and_objc_doc.dart index 4a59b21005..f02f9d7e1f 100644 --- a/dev/tools/java_and_objc_doc.dart +++ b/dev/tools/java_and_objc_doc.dart @@ -23,7 +23,7 @@ Future main(List args) async { final String objcdocUrl = 'https://storage.googleapis.com/flutter_infra/flutter/$engineVersion/ios-objcdoc.zip'; generateDocs( - objcdocUrl, 'objcdoc', 'objc/Classes/FlutterViewController.html'); + objcdocUrl, 'objcdoc', 'Classes/FlutterViewController.html'); } Future generateDocs(