Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tagged builds on CircleCI #3225

Merged
merged 2 commits into from
Sep 19, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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