From 8e67688865c17243b03aa7ecb37e05c71b424164 Mon Sep 17 00:00:00 2001 From: David Dias Date: Sun, 3 Sep 2017 12:09:54 +0100 Subject: [PATCH 1/3] chore: update gitignore --- .gitignore | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index cd638b1..e4c5b0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,14 @@ +**/node_modules/ +**/*.log +test/repo-tests* +**/bundle.js # Logs logs *.log +coverage + # Runtime data pids *.pid @@ -20,14 +26,17 @@ coverage # node-waf configuration .lock-wscript -# Compiled binary addons (http://nodejs.org/api/addons.html) -build/Release +build # Dependency directory # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git node_modules - -coverage - +lib dist +test/test-data/go-ipfs-repo/LOCK +test/test-data/go-ipfs-repo/LOG +test/test-data/go-ipfs-repo/LOG.old + +# while testing npm5 +package-lock.json From 9e802bc644e39209f4639b03a99a45656849376c Mon Sep 17 00:00:00 2001 From: David Dias Date: Sun, 3 Sep 2017 12:10:01 +0100 Subject: [PATCH 2/3] chore: update CI --- .travis.yml | 20 ++++++++------------ circle.yml | 11 ++++++----- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4fe6550..584f308 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,20 @@ sudo: false language: node_js + matrix: include: - - node_js: 4 - env: CXX=g++-4.8 - node_js: 6 - env: - - SAUCE=true - - CXX=g++-4.8 - - node_js: stable env: CXX=g++-4.8 - -# Make sure we have new NPM. -before_install: - - npm install -g npm + - node_js: 8 + env: CXX=g++-4.8 + # - node_js: stable + # env: CXX=g++-4.8 script: - npm run lint - - npm test + - npm run test - npm run coverage + - make test before_script: - export DISPLAY=:99.0 @@ -33,4 +29,4 @@ addons: sources: - ubuntu-toolchain-r-test packages: - - g++-4.8 \ No newline at end of file + - g++-4.8 diff --git a/circle.yml b/circle.yml index caf6887..56f7efb 100644 --- a/circle.yml +++ b/circle.yml @@ -1,4 +1,3 @@ - machine: node: version: stable @@ -6,8 +5,10 @@ machine: 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' + - curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb + - sudo dpkg -i google-chrome.deb || true - sudo apt-get update - - sudo apt-get --only-upgrade install google-chrome-stable - - google-chrome --version \ No newline at end of file + - sudo apt-get install -f + - sudo apt-get install --only-upgrade lsb-base + - sudo dpkg -i google-chrome.deb + - google-chrome --version From 1a95b70e8695d613bc84de0411dd933439f6ade7 Mon Sep 17 00:00:00 2001 From: David Dias Date: Sun, 3 Sep 2017 12:10:48 +0100 Subject: [PATCH 3/3] chore: update deps --- README.md | 7 +++---- package.json | 13 +++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 78d645b..5a3ccf0 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,10 @@ [![Coverage Status](https://coveralls.io/repos/github/libp2p/js-libp2p-identify/badge.svg?branch=master)](https://coveralls.io/github/libp2p/js-libp2p-identify?branch=master) [![Travis CI](https://travis-ci.org/libp2p/js-libp2p-identify.svg?branch=master)](https://travis-ci.org/libp2p/js-libp2p-identify) [![Circle CI](https://circleci.com/gh/libp2p/js-libp2p-identify.svg?style=svg)](https://circleci.com/gh/libp2p/js-libp2p-identify) -[![Dependency Status](https://david-dm.org/libp2p/js-libp2p-identify.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-identify) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard) +[![Dependency Status](https://david-dm.org/libp2p/js-libp2p-identify.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-identify) +[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard) ![](https://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square) -![](https://img.shields.io/badge/Node.js-%3E%3D4.0.0-orange.svg?style=flat-square) - -[![Sauce Test Status](https://saucelabs.com/browser-matrix/libp2p-js-identify.svg)](https://saucelabs.com/u/libp2p-js-identify) +![](https://img.shields.io/badge/Node.js-%3E%3D6.0.0-orange.svg?style=flat-square) > libp2p Identify Protocol diff --git a/package.json b/package.json index b252ee9..fde904c 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,8 @@ "test" ], "engines": { - "node": ">=4.0.0" + "node": ">=6.0.0", + "npm": ">=3.0.0" }, "repository": { "type": "git", @@ -38,15 +39,15 @@ "homepage": "https://github.com/libp2p/js-libp2p-identify#readme", "devDependencies": { "aegir": "^11.0.2", - "chai": "^4.1.0", + "chai": "^4.1.2", "dirty-chai": "^2.0.1", "pre-commit": "^1.2.2", "pull-pair": "^1.1.0" }, "dependencies": { - "multiaddr": "^2.3.0", - "peer-id": "~0.9.0", - "peer-info": "~0.10.0", + "multiaddr": "^3.0.0", + "peer-id": "~0.10.0", + "peer-info": "~0.11.0", "protocol-buffers": "^3.2.1", "pull-length-prefixed": "^1.3.0", "pull-stream": "^3.6.0" @@ -57,4 +58,4 @@ "Greenkeeper ", "Richard Littauer " ] -} \ No newline at end of file +}