Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/p2p addrs situation #72

Merged
merged 4 commits into from
Sep 3, 2017
Merged
Show file tree
Hide file tree
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
16 changes: 14 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,12 +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
29 changes: 22 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,32 @@
sudo: false
language: node_js
node_js:
- 4
- 5

# Make sure we have new NPM.
before_install:
- npm install -g npm
matrix:
include:
- node_js: 6
env: CXX=g++-4.8
- 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
- sh -e /etc/init.d/xvfb start

after_success:
- npm run coverage-publish

addons:
firefox: 'latest'
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
11 changes: 11 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
machine:
node:
version: stable

dependencies:
pre:
- google-chrome --version
- 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 install -f
- sudo apt-get install --only-upgrade lsb-base
- sudo dpkg -i google-chrome.deb
- google-chrome --version
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@
"homepage": "https://github.com/libp2p/js-libp2p-utp",
"devDependencies": {
"aegir": "^11.0.2",
"chai": "^4.0.2",
"chai": "^4.1.2",
"dirty-chai": "^2.0.1",
"interface-connection": "~0.3.2",
"interface-transport": "~0.3.5",
"pre-commit": "^1.2.2",
"tape": "^4.7.0"
"tape": "^4.8.0"
},
"dependencies": {
"multiaddr": "^2.3.0",
"utp-native": "^1.5.2"
"multiaddr": "^3.0.0",
"utp-native": "^1.5.4"
}
}
4 changes: 2 additions & 2 deletions test/interface-connection.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
'use strict'

var tape = require('tape')
var tests = require('interface-connection/tests')
var tests = require('interface-connection')
var conn = require('../src')

describe('interface-connection', () => {
describe.skip('interface-connection', () => {
it('works', (done) => {
tests(tape, {
setup (t, cb) {
Expand Down
4 changes: 2 additions & 2 deletions test/interface-transport.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
'use strict'

var tape = require('tape')
var tests = require('interface-transport/tests')
var tests = require('interface-transport')
var conn = require('../src')

describe('interface-transport', () => {
describe.skip('interface-transport', () => {
it('works', (done) => {
tests(tape, {
setup (t, cb) {
Expand Down