diff --git a/.travis.yml b/.travis.yml index f0cf1381b48..71acda37d7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ os: - linux -sudo: required +sudo: false addons: apt: # sky_shell binary depends on /usr/lib/x86_64-linux-gnu/libstdc++.so.6 version GLIBCXX_3.4.18 @@ -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 ce87c083d3b..d6d5da00136 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" ]; 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/tools/java_and_objc_doc.dart b/dev/tools/java_and_objc_doc.dart index f02f9d7e1f6..4a59b210057 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', 'Classes/FlutterViewController.html'); + objcdocUrl, 'objcdoc', 'objc/Classes/FlutterViewController.html'); } Future generateDocs(