Skip to content
This repository was archived by the owner on Jul 21, 2023. It is now read-only.

feat: p2p addrs situation #69

Merged
merged 3 commits into from
Sep 3, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
**/node_modules/
**/*.log
test/repo-tests*
**/bundle.js

# Logs
logs
*.log
npm-debug.log*

coverage

# Runtime data
pids
@@ -20,15 +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

# Optional npm cache directory
.npm

# Optional REPL history
.node_repl_history
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
18 changes: 6 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -3,24 +3,18 @@ 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
8 changes: 5 additions & 3 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -30,11 +30,11 @@
"homepage": "https://github.com/libp2p/js-libp2p-multiplex#readme",
"devDependencies": {
"aegir": "^11.0.2",
"chai": "^4.0.2",
"dirty-chai": "^2.0.0",
"chai": "^4.1.2",
"dirty-chai": "^2.0.1",
"interface-stream-muxer": "~0.5.7",
"libp2p-tcp": "^0.10.1",
"libp2p-websockets": "~0.10.0",
"libp2p-tcp": "^0.11.0",
"libp2p-websockets": "~0.10.1",
"pre-commit": "^1.2.2",
"pull-pair": "^1.1.0"
},
@@ -55,4 +55,4 @@
"Victor Bjelkholm <victorbjelkholm@gmail.com>",
"greenkeeperio-bot <support@greenkeeper.io>"
]
}
}