Skip to content

Commit

Permalink
feat: use go-ipfs 0.4.10
Browse files Browse the repository at this point in the history
  • Loading branch information
daviddias authored Sep 2, 2017
1 parent e3b7583 commit b0286fb
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 19 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
package-lock.json
yarn.lock

**/node_modules/
**/*.log
test/repo-tests*
Expand Down Expand Up @@ -32,4 +35,4 @@ build
node_modules

dist
docs
docs
15 changes: 5 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,16 @@ language: node_js

matrix:
include:
- node_js: 4
env: CXX=g++-4.8
- node_js: 6
env:
- CXX=g++-4.8
- node_js: stable
env: CXX=g++-4.8

# Make sure we have new NPM.
before_install:
- npm install -g npm@4
- 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

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
"license": "MIT",
"dependencies": {
"async": "^2.5.0",
"go-ipfs-dep": "0.4.9",
"ipfs-api": "^14.1.0",
"go-ipfs-dep": "0.4.10",
"ipfs-api": "^14.1.2",
"multiaddr": "^2.3.0",
"once": "^1.4.0",
"rimraf": "^2.6.1",
Expand All @@ -58,11 +58,11 @@
},
"devDependencies": {
"aegir": "^11.0.2",
"chai": "^4.1.0",
"chai": "^4.1.1",
"dirty-chai": "^2.0.1",
"is-running": "1.0.5",
"mkdirp": "^0.5.1",
"multihashes": "~0.4.5",
"multihashes": "~0.4.8",
"pre-commit": "^1.2.2",
"safe-buffer": "^5.1.1"
},
Expand Down
6 changes: 5 additions & 1 deletion test/exec.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ function makeCheck (n, done) {
}
}

describe('exec', () => {
// TODO The test vector, `tail` is no longer a good test vector as it is not
// exiting as it once was when the test was designed
// - [ ] Need test vector or figure out why tail changed
// Ref: https://github.com/ipfs/js-ipfsd-ctl/pull/160#issuecomment-325669206
describe.skip('exec', () => {
it('SIGTERM kills hang', (done) => {
const tok = token()

Expand Down
6 changes: 3 additions & 3 deletions test/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ describe('daemons', () => {
it('prints the version', (done) => {
ipfsd.version((err, version) => {
expect(err).to.not.exist()
expect(version).to.be.eql('ipfs version 0.4.9')
expect(version).to.be.eql('ipfs version 0.4.10')
done()
})
})
Expand Down Expand Up @@ -446,8 +446,8 @@ describe('daemons', () => {

expect(daemon).to.have.property('apiAddr')
expect(daemon).to.have.property('gatewayAddr')
expect(daemon.apiAddr).to.be.instanceof(multiaddr)
expect(daemon.gatewayAddr).to.be.instanceof(multiaddr)
expect(multiaddr.isMultiaddr(daemon.apiAddr)).to.equal(true)
expect(multiaddr.isMultiaddr(daemon.gatewayAddr)).to.equal(true)
expect(daemon.apiAddr).to.not.equal(null)
expect(daemon.gatewayAddr).to.not.equal(null)

Expand Down

0 comments on commit b0286fb

Please sign in to comment.