From 620c9b11f0c67389a9328e0bfba542922af1faec Mon Sep 17 00:00:00 2001 From: Lucas Wojciechowski Date: Mon, 19 Sep 2016 16:43:17 -0700 Subject: [PATCH] Fix tagged builds on CircleCI (#3225) * Fix circle tagged build * improve docs --- ci/dependencies.sh | 2 +- ci/test.sh | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ci/dependencies.sh b/ci/dependencies.sh index a9467b5382b..44b203c33d9 100755 --- a/ci/dependencies.sh +++ b/ci/dependencies.sh @@ -13,6 +13,6 @@ else source ./nvm/nvm.sh && nvm use ${NODE_VERSION} && npm install && npm ls fi -if [ "$CIRCLE_BRANCH" == "master" ] || [ -z "$CIRCLE_TAG" ]; then +if [ "$CIRCLE_BRANCH" == "master" ] || [ -n "$CIRCLE_TAG" ]; then pip install --user --upgrade awscli fi diff --git a/ci/test.sh b/ci/test.sh index 7e45076c268..6e124f2941b 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -3,7 +3,7 @@ source ./nvm/nvm.sh nvm use ${NODE_VERSION} -set -eu +set -e set -o pipefail # add npm packages to $PATH @@ -27,7 +27,10 @@ npm run test-cov # send coverage report to coveralls nyc report --reporter=lcov -(node ./node_modules/coveralls/bin/coveralls.js < ./coverage/lcov.info) || true +# this code works around a Coveralls / CircleCI bug triggered by tagged builds +if [ -z "$CIRCLE_TAG" ]; then + (node ./node_modules/coveralls/bin/coveralls.js < ./coverage/lcov.info) || true +fi # upload benchmarks if [ "$CIRCLE_BRANCH" == "master" ]; then