Skip to content

Commit

Permalink
Fix tagged builds on CircleCI (#3225)
Browse files Browse the repository at this point in the history
* Fix circle tagged build

* improve docs
  • Loading branch information
lucaswoj authored Sep 19, 2016
1 parent 7929862 commit 620c9b1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ci/dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 5 additions & 2 deletions ci/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source ./nvm/nvm.sh
nvm use ${NODE_VERSION}

set -eu
set -e
set -o pipefail

# add npm packages to $PATH
Expand All @@ -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
Expand Down

0 comments on commit 620c9b1

Please sign in to comment.