From 001da10d00f8c9dacf126ae984766f35f422b32f Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Fri, 15 Apr 2016 12:24:29 +0200 Subject: [PATCH] refactor: Use aegir --- .travis.yml | 21 +++++++++++++-------- README.md | 3 +-- circle.yml | 13 +++++++++---- package.json | 21 +++++++++++---------- 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index 301d60d8..e1d6320b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,24 @@ +sudo: false language: node_js node_js: - - "4" - - "5" - -branches: - only: - - master + - 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' before_script: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start + +after_success: + - npm run coverage-publish diff --git a/README.md b/README.md index d221d767..c1c0a649 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,8 @@ IPFS Repo JavaScript Implementation [![](https://img.shields.io/badge/project-IPFS-blue.svg?style=flat-square)](http://ipfs.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-ipfs-repo.svg)](https://travis-ci.org/ipfs/js-ipfs-repo) -![](https://img.shields.io/badge/coverage-90%25-yellow.svg?style=flat-square) [![Dependency Status](https://david-dm.org/diasdavid/js-peer-id.svg?style=flat-square)](https://david-dm.org/ipfs/js-ipfs-repo) +[![Coverage Status](https://coveralls.io/repos/github/ipfs/js-ipfs-repo/badge.svg?branch=master)](https://coveralls.io/github/ipfs/js-ipfs-repo?branch=master) [![Dependency Status](https://david-dm.org/diasdavid/js-peer-id.svg?style=flat-square)](https://david-dm.org/ipfs/js-ipfs-repo) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard) -[![dignified.js](https://img.shields.io/badge/uses-dignified.js-blue.svg?style=flat-square)](https://github.com/dignifiedquire/dignified.js) ## Description diff --git a/circle.yml b/circle.yml index 35f0f3a2..434211a7 100644 --- a/circle.yml +++ b/circle.yml @@ -1,7 +1,12 @@ -dependencies: - pre: - - npm i -g npm - 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 aabb7965..4fa007a0 100644 --- a/package.json +++ b/package.json @@ -5,15 +5,16 @@ "main": "lib/index.js", "jsnext:main": "src/index.js", "scripts": { - "test": "dignified-test", - "test:node": "dignified-test node", - "test:browser": "dignified-test browser", - "build": "dignified-build", - "coverage": "dignified-coverage", - "lint": "dignified-lint", - "release": "dignified-release", - "release-minor": "dignified-release minor", - "release-major": "dignified-release major" + "test": "aegir-test", + "test:node": "aegir-test node", + "test:browser": "aegir-test browser", + "build": "aegir-build", + "coverage": "aegir-coverage", + "lint": "aegir-lint", + "release": "aegir-release", + "release-minor": "aegir-release minor", + "release-major": "aegir-release major", + "coverage-publish": "aegir-coverage publish" }, "repository": { "type": "git", @@ -28,12 +29,12 @@ ], "homepage": "https://github.com/ipfs/js-ipfs-repo", "devDependencies": { + "aegir": "^2.1.0", "async": "^1.5.2", "bl": "^1.1.2", "bs58": "^3.0.0", "buffer-loader": "^0.0.1", "chai": "^3.5.0", - "dignified.js": "^1.0.1", "fs-blob-store": "^5.2.1", "idb-plus-blob-store": "^1.0.0", "local-storage-blob-store": "0.0.3",