From bf4fb7824ed66d5aefadaf83b7168ea0ed987b1d Mon Sep 17 00:00:00 2001 From: David Dias Date: Sun, 3 Sep 2017 12:30:52 +0100 Subject: [PATCH] feat: p2p addrs situation (#91) * chore: update gitignore * chore: update CI * chore: update deps --- .gitignore | 8 ++++++++ .travis.yml | 20 ++++++++------------ README.md | 2 +- circle.yml | 8 +++++--- package.json | 15 ++++++++------- 5 files changed, 30 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index fb8d1c9..e4c5b0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ **/node_modules/ **/*.log test/repo-tests* +**/bundle.js # Logs logs @@ -31,4 +32,11 @@ build # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git node_modules +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 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/README.md b/README.md index 1eee6d5..8450564 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-secio.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-secio) [![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) +![](https://img.shields.io/badge/Node.js-%3E%3D6.0.0-orange.svg?style=flat-square) > Secio implementation in JavaScript diff --git a/circle.yml b/circle.yml index 434211a..56f7efb 100644 --- a/circle.yml +++ b/circle.yml @@ -5,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 + - sudo apt-get install -f + - sudo apt-get install --only-upgrade lsb-base + - sudo dpkg -i google-chrome.deb - google-chrome --version diff --git a/package.json b/package.json index 1add223..d7cfff5 100644 --- a/package.json +++ b/package.json @@ -26,11 +26,11 @@ "license": "MIT", "dependencies": { "async": "^2.5.0", - "debug": "^2.6.8", + "debug": "^3.0.1", "interface-connection": "~0.3.2", - "libp2p-crypto": "~0.9.4", + "libp2p-crypto": "~0.10.0", "multihashing-async": "~0.4.6", - "peer-id": "~0.9.0", + "peer-id": "~0.10.0", "protocol-buffers": "^3.2.1", "pull-defer": "^0.2.2", "pull-handshake": "^1.1.4", @@ -40,10 +40,10 @@ "devDependencies": { "aegir": "^11.0.2", "benchmark": "^2.1.4", - "chai": "^4.1.0", + "chai": "^4.1.2", "dirty-chai": "^2.0.1", "gulp": "^3.9.1", - "libp2p-websockets": "~0.10.0", + "libp2p-websockets": "~0.10.1", "multistream-select": "^0.13.5", "pre-commit": "^1.2.2", "pull-goodbye": "0.0.2", @@ -54,7 +54,8 @@ "test" ], "engines": { - "node": ">=4.0.0" + "node": ">=6.0.0", + "npm": ">=3.0.0" }, "repository": { "type": "git", @@ -71,4 +72,4 @@ "Richard Littauer ", "greenkeeperio-bot " ] -} \ No newline at end of file +}