From 67ca37c3561160d3528fc1ebad181f2209573384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=B4=A0=C9=AA=E1=B4=84=E1=B4=9B=E1=B4=8F=CA=80=20=CA=99?= =?UTF-8?q?=E1=B4=8A=E1=B4=87=CA=9F=E1=B4=8B=CA=9C=E1=B4=8F=CA=9F=E1=B4=8D?= Date: Thu, 14 Dec 2017 08:14:36 +0100 Subject: [PATCH] chore: updating CI files (#132) * Updating CI files This commit updates all CI scripts to the latest version * chore: update deps * bump timout * fix circle --- .travis.yml | 2 +- appveyor.yml | 29 +++++++++++++++++++++++++++++ ci/Jenkinsfile | 2 ++ package.json | 10 +++++----- test/transports.node.js | 2 +- 5 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 appveyor.yml create mode 100644 ci/Jenkinsfile diff --git a/.travis.yml b/.travis.yml index 584f308f..5102ee5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +# Warning: This file is automatically synced from https://github.com/ipfs/ci-sync so if you want to change it, please change it there and ask someone to sync all repositories. sudo: false language: node_js @@ -14,7 +15,6 @@ script: - npm run lint - npm run test - npm run coverage - - make test before_script: - export DISPLAY=:99.0 diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..046bf910 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,29 @@ +# Warning: This file is automatically synced from https://github.com/ipfs/ci-sync so if you want to change it, please change it there and ask someone to sync all repositories. +version: "{build}" + +environment: + matrix: + - nodejs_version: "6" + - nodejs_version: "8" + +matrix: + fast_finish: true + +install: + # Install Node.js + - ps: Install-Product node $env:nodejs_version + + # Upgrade npm + - npm install -g npm + + # Output our current versions for debugging + - node --version + - npm --version + + # Install our package dependencies + - npm install + +test_script: + - npm run test:node + +build: off diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile new file mode 100644 index 00000000..a7da2e54 --- /dev/null +++ b/ci/Jenkinsfile @@ -0,0 +1,2 @@ +// Warning: This file is automatically synced from https://github.com/ipfs/ci-sync so if you want to change it, please change it there and ask someone to sync all repositories. +javascript() diff --git a/package.json b/package.json index 28d10aa2..4a0b7cb2 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "dependencies": { "async": "^2.6.0", "libp2p-ping": "~0.6.0", - "libp2p-swarm": "~0.33.2", + "libp2p-swarm": "~0.34.0", "mafmt": "^3.0.2", "multiaddr": "^3.0.1", "peer-book": "~0.5.2", @@ -55,22 +55,22 @@ "libp2p-circuit": "~0.1.4", "libp2p-kad-dht": "~0.6.0", "libp2p-mdns": "~0.9.1", - "libp2p-multiplex": "~0.5.0", + "libp2p-multiplex": "~0.5.1", "libp2p-railing": "~0.7.1", "libp2p-secio": "~0.8.1", "libp2p-spdy": "~0.11.0", "libp2p-tcp": "~0.11.1", "libp2p-webrtc-star": "~0.13.3", "libp2p-websockets": "~0.10.4", - "libp2p-websocket-star": "~0.7.1", - "libp2p-websocket-star-rendezvous": "~0.2.1", + "libp2p-websocket-star": "~0.7.2", + "libp2p-websocket-star-rendezvous": "~0.2.2", "lodash.times": "^4.3.2", "pre-commit": "^1.2.2", "pull-goodbye": "0.0.2", "pull-serializer": "~0.3.2", "pull-stream": "^3.6.1", "safe-buffer": "^5.1.1", - "sinon": "^4.1.2", + "sinon": "^4.1.3", "wrtc": "0.0.63" }, "contributors": [ diff --git a/test/transports.node.js b/test/transports.node.js index 413f2793..9b725656 100644 --- a/test/transports.node.js +++ b/test/transports.node.js @@ -517,7 +517,7 @@ describe('transports', () => { }) it('nodeAll.dial nodeWStar using PeerInfo', function (done) { - this.timeout(10 * 1000) + this.timeout(40 * 1000) nodeAll.dial(nodeWStar.peerInfo, (err) => { expect(err).to.not.exist()