From fababc58bcc6077385d45b7a836c04beb1f50628 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Fri, 15 Apr 2016 13:24:26 +0200 Subject: [PATCH] refactor: Use aegir --- .travis.yml | 19 ++++++++++--------- README.md | 2 +- circle.yml | 9 +++++++++ package.json | 17 +++++++++-------- 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3303e1..e1d6320 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,17 @@ +sudo: false language: node_js node_js: - 4 - 5 -branches: - only: - - master - +# 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' @@ -18,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 e4dd991..2d006fe 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ peer-info JavaScript implementation [![](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/diasdavid/js-peer-info.svg?style=flat-square)](https://travis-ci.org/diasdavid/js-peer-info) -![](https://img.shields.io/badge/coverage-100%25-brightgreen.svg?style=flat-square) +[![Coverage Status](https://coveralls.io/repos/github/diasdavid/js-peer-info/badge.svg?branch=master)](https://coveralls.io/github/diasdavid/js-peer-info?branch=master) [![Dependency Status](https://david-dm.org/diasdavid/js-peer-info.svg?style=flat-square)](https://david-dm.org/diasdavid/js-peer-info) [![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 ac7b816..fb915bc 100644 --- a/package.json +++ b/package.json @@ -5,13 +5,14 @@ "main": "lib/index.js", "jsnext:main": "src/index.js", "scripts": { - "lint": "dignified-lint", - "build": "dignified-build", - "test": "dignified-test", - "test:node": "dignified-test node", - "test:browser": "dignified-test browser", - "release": "dignified-release", - "coverage": "dignified-coverage" + "lint": "aegir-lint", + "build": "aegir-build", + "test": "aegir-test", + "test:node": "aegir-test node", + "test:browser": "aegir-test browser", + "release": "aegir-release", + "coverage": "aegir-coverage", + "coverage-publish": "aegir-coverage publish" }, "repository": { "type": "git", @@ -34,9 +35,9 @@ "test" ], "devDependencies": { + "aegir": "^2.1.1", "buffer-loader": "0.0.1", "chai": "^3.5.0", - "dignified.js": "^1.0.0", "multiaddr": "^1.1.1", "peer-id": "^0.6.6", "pre-commit": "^1.1.2"