Skip to content
This repository has been archived by the owner on Oct 3, 2023. It is now read-only.

Commit

Permalink
feat: p2p addrs situation (#70)
Browse files Browse the repository at this point in the history
* chore: update gitignore and CI

* chore: update deps
  • Loading branch information
daviddias authored Sep 3, 2017
1 parent c8e76e8 commit 34064b2
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 25 deletions.
17 changes: 15 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
**/node_modules/
**/*.log
test/repo-tests*
**/bundle.js

# Logs
logs
*.log

coverage

# Runtime data
pids
*.pid
Expand All @@ -19,11 +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

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: 7 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 5 additions & 3 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,24 @@
"url": "https://github.com/libp2p/js-ipfs-railing/issues"
},
"engines": {
"node": ">=4.0.0",
"node": ">=6.0.0",
"npm": ">=3.0.0"
},
"homepage": "https://github.com/libp2p/js-ipfs-railing",
"devDependencies": {
"aegir": "^11.0.2",
"chai": "^4.1.0",
"libp2p-swarm": "~0.31.0",
"libp2p-tcp": "~0.10.2",
"chai": "^4.1.2",
"libp2p-swarm": "~0.32.0",
"libp2p-tcp": "~0.11.0",
"pre-commit": "^1.2.2"
},
"dependencies": {
"async": "^2.5.0",
"debug": "^2.6.8",
"debug": "^3.0.1",
"lodash": "^4.17.4",
"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"
},
"pre-commit": [
"lint",
Expand All @@ -56,4 +56,4 @@
"Nuno Nogueira <nunofmn@gmail.com>",
"Richard Littauer <richard.littauer@gmail.com>"
]
}
}

0 comments on commit 34064b2

Please sign in to comment.