From 7f0b908ddccfe05baaa2a6abbff433457602b772 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Tue, 14 Feb 2017 10:25:02 -0800 Subject: [PATCH] Don't upload lcov to coveralls for pull requests (#8143) --- dev/bots/docs.sh | 8 +++----- dev/bots/travis_upload.sh | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dev/bots/docs.sh b/dev/bots/docs.sh index c6364751176..ec2b03c6d8e 100755 --- a/dev/bots/docs.sh +++ b/dev/bots/docs.sh @@ -15,9 +15,7 @@ cp dev/docs/google2ed1af765c529f57.html dev/docs/doc # Upload new API docs when on Travis and branch is master -if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then - if [ "$TRAVIS_BRANCH" = "master" ]; then - cd dev/docs - firebase deploy --project docs-flutter-io - fi +if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_BRANCH" = "master" ]; then + cd dev/docs + firebase deploy --project docs-flutter-io fi diff --git a/dev/bots/travis_upload.sh b/dev/bots/travis_upload.sh index 27b0ac2424b..87d1a5a9e52 100755 --- a/dev/bots/travis_upload.sh +++ b/dev/bots/travis_upload.sh @@ -6,16 +6,16 @@ export PATH="$PWD/bin:$PWD/bin/cache/dart-sdk/bin:$PATH" LCOV_FILE=./packages/flutter/coverage/lcov.info -if [ -n "$TRAVIS" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ -a "$LCOV_FILE" ]; then +if [ "$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 $GCLOUD auth activate-service-account --key-file ../gcloud_key_file.json STORAGE_URL=gs://flutter_infra/flutter/coverage/lcov.info $GSUTIL cp $LCOV_FILE $STORAGE_URL + + (cd packages/flutter && coveralls-lcov coverage/lcov.info) fi # generate the API docs, upload them ./dev/bots/docs.sh - -(cd packages/flutter && coveralls-lcov coverage/lcov.info)