From 5ae183620100db9d2c0f7e0ec75e9608420f36db Mon Sep 17 00:00:00 2001 From: David Dias Date: Mon, 18 Dec 2017 20:53:24 +0000 Subject: [PATCH 1/4] chore: update aegir --- package.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index cb6446bfb9..1a470d7980 100644 --- a/package.json +++ b/package.json @@ -23,13 +23,11 @@ "build": "aegir build", "test": "aegir test -t node -t browser --no-cors", "test:node": "aegir test -t node", - "test:browser": "aegir test -t browser -t webworker --no-cors", - "test:node": "aegir test -t node", + "test:browser": "aegir test -t browser --no-cors", "test:node:core": "aegir test -t node -f test/core/**.js", "test:node:http": "aegir test -t node -f test/http-api/index.js", "test:node:gateway": "aegir test -t node -f test/gateway/index.js", "test:node:cli": "aegir test -t node -f test/cli/index.js", - "test:browser": "aegir test -t browser --no-cors", "test:bootstrapers": "IPFS_TEST=bootstrapers aegir test -t browser -f test/bootstrapers.js", "benchmark": "echo \"Error: no benchmarks yet\" && exit 1", "benchmark:node": "echo \"Error: no benchmarks yet\" && exit 1", @@ -60,7 +58,7 @@ }, "homepage": "https://github.com/ipfs/js-ipfs#readme", "devDependencies": { - "aegir": "^12.2.0", + "aegir": "^12.3.0", "buffer-loader": "0.0.1", "chai": "^4.1.2", "delay": "^2.0.0", From a29a4fb70557a327b09c6161d069f4f6b54b3c14 Mon Sep 17 00:00:00 2001 From: David Dias Date: Sun, 7 Jan 2018 17:15:35 +0000 Subject: [PATCH 2/4] chore: update deps --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1a470d7980..a3cf93e330 100644 --- a/package.json +++ b/package.json @@ -113,14 +113,14 @@ "is-ipfs": "^0.3.2", "is-stream": "^1.1.0", "joi": "^13.0.2", - "libp2p": "~0.14.0", + "libp2p": "~0.15.0", "libp2p-circuit": "~0.1.4", "libp2p-floodsub": "~0.13.1", "libp2p-kad-dht": "~0.6.0", "libp2p-mdns": "~0.9.1", "libp2p-multiplex": "~0.5.1", "libp2p-railing": "~0.7.1", - "libp2p-secio": "~0.8.1", + "libp2p-secio": "~0.9.0", "libp2p-tcp": "~0.11.1", "libp2p-webrtc-star": "~0.13.3", "libp2p-websocket-star": "~0.7.2", From 721383ae8962e29ea9316b9ccab01dee5ba29ea6 Mon Sep 17 00:00:00 2001 From: David Dias Date: Sun, 7 Jan 2018 17:18:54 +0000 Subject: [PATCH 3/4] chore: bring back webworker --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a3cf93e330..5058eeed13 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,9 @@ "scripts": { "lint": "aegir lint", "build": "aegir build", - "test": "aegir test -t node -t browser --no-cors", + "test": "aegir test -t node -t browser -t webworker --no-cors", "test:node": "aegir test -t node", - "test:browser": "aegir test -t browser --no-cors", + "test:browser": "aegir test -t browser -t webworker --no-cors", "test:node:core": "aegir test -t node -f test/core/**.js", "test:node:http": "aegir test -t node -f test/http-api/index.js", "test:node:gateway": "aegir test -t node -f test/gateway/index.js", From f732e85689dd1a7e1563651bdb32144e37b5a051 Mon Sep 17 00:00:00 2001 From: David Dias Date: Sun, 7 Jan 2018 17:39:40 +0000 Subject: [PATCH 4/4] chore: update circle config --- circle.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/circle.yml b/circle.yml index a132855ce9..e0338e62d4 100644 --- a/circle.yml +++ b/circle.yml @@ -1,21 +1,18 @@ +# 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. machine: node: version: stable test: post: - - npm run coverage -- --upload + - npm run coverage -- --upload --providers coveralls dependencies: pre: - google-chrome --version - curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - - for v in $(curl http://archive.ubuntu.com/ubuntu/pool/main/n/nss/ | grep "href=" | grep "libnss3.*deb\"" -o | grep -o "libnss3.*deb" | grep "3.28" | grep "14.04"); do curl -L -o $v http://archive.ubuntu.com/ubuntu/pool/main/n/nss/$v; done && rm libnss3-tools*_i386.deb libnss3-dev*_i386.deb - sudo dpkg -i google-chrome.deb || true - - sudo dpkg -i libnss3*.deb || true - sudo apt-get update - - sudo apt-get install -f || true - - sudo dpkg -i libnss3*.deb - sudo apt-get install -f - sudo apt-get install --only-upgrade lsb-base - sudo dpkg -i google-chrome.deb