Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Nickersoft/push.js
Browse files Browse the repository at this point in the history
  • Loading branch information
Nickersoft committed Oct 5, 2017
2 parents 664efb8 + 0f4ffce commit dec21ea
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
9 changes: 5 additions & 4 deletions .travis.yml
Expand Up @@ -5,13 +5,14 @@ env:
language: node_js
node_js:
- stable
before_install: yarn global add greenkeeper-lockfile@1
before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
before_install: yarn global add greenkeeper-lockfile@1
before_script: greenkeeper-lockfile-update
after_script: greenkeeper-lockfile-upload
- greenkeeper-lockfile-update
script:
- yarn run test
- if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi
after_script: "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
after_script:
- greenkeeper-lockfile-upload
- "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
2 changes: 2 additions & 0 deletions README.md
@@ -1,5 +1,7 @@
# [<img src="https://raw.githubusercontent.com/Nickersoft/push.js/master/logo.png" width="200">](http://pushjs.org)

[![Greenkeeper badge](https://badges.greenkeeper.io/Nickersoft/push.js.svg)](https://greenkeeper.io/)

[![Build Status](https://img.shields.io/travis/Nickersoft/push.js.svg)](https://travis-ci.org/Nickersoft/push.js)
[![npm version](https://img.shields.io/npm/v/push.js.svg)](https://npmjs.com/package/push.js)
[![npm](https://img.shields.io/npm/dm/push.js.svg)](https://npmjs.com/package/push.js)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -32,7 +32,7 @@
"babel-preset-es2015": "^6.24.1",
"babelify": "^7.3.0",
"browserify": "^14.4.0",
"coveralls": "^2.13.1",
"coveralls": "^3.0.0",
"eslint": "^4.7.2",
"jasmine-core": "^2.8.0",
"js-yaml": "^3.10.0",
Expand Down

0 comments on commit dec21ea

Please sign in to comment.