From 9181c5ac58c6f585c8853974d5383ca579325311 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Fri, 15 Apr 2016 13:07:54 +0200 Subject: [PATCH] refactor: use aegir --- .npmignore | 2 ++ .travis.yml | 19 ++++++++++++------- README.md | 2 +- circle.yml | 9 +++++++++ package.json | 10 ++++++++-- 5 files changed, 32 insertions(+), 10 deletions(-) diff --git a/.npmignore b/.npmignore index c3c3bbe..c57cab7 100644 --- a/.npmignore +++ b/.npmignore @@ -24,3 +24,5 @@ build/Release # Optional REPL history .node_repl_history + +test \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 6c4753d..e1d6320 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,17 @@ +sudo: false language: node_js node_js: - - '4' - - '5' + - 4 + - 5 +# Make sure we have new NPM. before_install: - - npm i -g npm - # Workaround for a permissions issue with Travis virtual machine images + - npm install -g npm + +script: + - npm run lint + - npm test + - npm run coverage addons: firefox: 'latest' @@ -14,6 +20,5 @@ before_script: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start -script: - - npm run lint - - npm test +after_success: + - npm run coverage-publish diff --git a/README.md b/README.md index d57a8cd..7217848 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ js-libp2p-ipfs [![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://ipn.io) [[![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs) ![Build Status](https://travis-ci.org/ipfs/js-libp2p-ipfs.svg?style=flat-square)](https://travis-ci.org/ipfs/js-libp2p-ipfs) -![](https://img.shields.io/badge/coverage-%3F-yellow.svg?style=flat-square) +[![Coverage Status](https://coveralls.io/repos/github/ipfs/js-libp2p-ipfs/badge.svg?branch=master)](https://coveralls.io/github/ipfs/js-libp2p-ipfs?branch=master) [![Dependency Status](https://david-dm.org/ipfs/js-libp2p-ipfs.svg?style=flat-square)](https://david-dm.org/ipfs/js-libp2p-ipfs) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard) diff --git a/circle.yml b/circle.yml index 6d74323..434211a 100644 --- a/circle.yml +++ b/circle.yml @@ -1,3 +1,12 @@ machine: node: version: stable + +dependencies: + pre: + - google-chrome --version + - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add - + - sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' + - sudo apt-get update + - sudo apt-get --only-upgrade install google-chrome-stable + - google-chrome --version diff --git a/package.json b/package.json index 8a3a3a8..c786948 100644 --- a/package.json +++ b/package.json @@ -10,12 +10,18 @@ "lint": "aegir-lint", "release": "aegir-release node", "release-minor": "aegir-release node --minor", - "release-major": "aegir-release node --major" + "release-major": "aegir-release node --major", + "coverage": "aegir-coverage", + "coverage-publish": "aegir-coverage publish" }, "repository": { "type": "git", "url": "git+https://github.com/ipfs/js-libp2p-ipfs.git" }, + "pre-commit": [ + "lint", + "test" + ], "keywords": [ "IPFS" ], @@ -27,7 +33,7 @@ "homepage": "https://github.com/ipfs/js-libp2p-ipfs#readme", "devDependencies": { "chai": "^3.5.0", - "aegir": "^2.0.0", + "aegir": "^2.1.1", "pre-commit": "^1.1.2" }, "dependencies": {