Skip to content

Commit 48905ae

Browse files
tvolkertgspencergoog
authored andcommitted
Re-enable coverage and docs uploading (flutter#11005)
This time, do so in Travis' sudo-enabled environment, which is said to be less prone to networking issues. It also means we'll run in an env with 7.5GB of RAM instead of 4GB or RAM (at the cost of about 45 seconds of extra boot-up time). flutter#10940
1 parent e64e468 commit 48905ae

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
os:
22
- linux
3-
sudo: false
3+
sudo: required
44
addons:
55
apt:
66
# sky_shell binary depends on /usr/lib/x86_64-linux-gnu/libstdc++.so.6 version GLIBCXX_3.4.18
@@ -22,8 +22,7 @@ env:
2222
before_script:
2323
- ./dev/bots/travis_setup.sh
2424
script:
25-
# TODO(tvolkert): Re-enable `&& ./dev/bots/travis_upload.sh`
26-
- (./bin/cache/dart-sdk/bin/dart ./dev/bots/test.dart)
25+
- (./bin/cache/dart-sdk/bin/dart ./dev/bots/test.dart && ./dev/bots/travis_upload.sh)
2726
cache:
2827
directories:
2928
- $HOME/.pub-cache

dev/bots/travis_setup.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ echo $KEY_FILE | base64 --decode > ../gcloud_key_file.json
55

66
set -x
77

8-
# TODO(tvolkert): Re-enable once this is able to successfully run on Travis
9-
#if [ -n "$TRAVIS" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
10-
# export CLOUDSDK_CORE_DISABLE_PROMPTS=1
11-
# curl https://sdk.cloud.google.com | bash
12-
#fi
8+
if [ -n "$TRAVIS" ]; then
9+
export CLOUDSDK_CORE_DISABLE_PROMPTS=1
10+
curl https://sdk.cloud.google.com | bash
11+
fi
1312

1413
# disable analytics on the bots and download Flutter dependencies
1514
./bin/flutter config --no-analytics

dev/tools/java_and_objc_doc.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Future<Null> main(List<String> args) async {
2323
final String objcdocUrl =
2424
'https://storage.googleapis.com/flutter_infra/flutter/$engineVersion/ios-objcdoc.zip';
2525
generateDocs(
26-
objcdocUrl, 'objcdoc', 'objc/Classes/FlutterViewController.html');
26+
objcdocUrl, 'objcdoc', 'Classes/FlutterViewController.html');
2727
}
2828

2929
Future<Null> generateDocs(

0 commit comments

Comments
 (0)