@@ -1,6 +1,5 @@
set -e
-if [ -z "$CI_PULL_REQUEST" ]
-then
+if [ -z "$CI_PULL_REQUEST" ] || [ "$CIRCLE_BRANCH" == "master" ]; then
npm run lint
npm run cover
cat ./coverage/lcov.info | ./node_modules/.bin/codecov
@@ -2,10 +2,6 @@ machine:
node:
version: 5
-general:
- branches:
- only: master
-
test:
override:
- bash ./build/ci.sh