From ccd863fde53b2e747b9447daa141becb701a2238 Mon Sep 17 00:00:00 2001 From: Hugo Dias Date: Fri, 24 May 2019 17:05:10 +0100 Subject: [PATCH 01/10] fix: prepare for aegir release --- .travis.yml | 9 +++++++++ package.json | 41 ++++++++++++++++++---------------------- test/constructor.spec.js | 4 ++-- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0be5b0ef5..20fccf3e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ stages: - cov node_js: + - '12' - '10' - '8' @@ -39,6 +40,14 @@ jobs: addons: firefox: latest script: npx aegir test -t browser -t webworker -- --browsers FirefoxHeadless + + - stage: test + name: electron + before_script: + - export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start + script: + - npx aegir test -t electron-main + - npx aegir test -t electron-renderer notifications: email: false diff --git a/package.json b/package.json index 50f63ae52..66c86c924 100644 --- a/package.json +++ b/package.json @@ -2,17 +2,24 @@ "name": "ipfs-http-client", "version": "32.0.1", "description": "A client library for the IPFS HTTP API", + "keywords": [ + "ipfs" + ], + "homepage": "https://github.com/ipfs/js-ipfs-http-client", + "bugs": "https://github.com/ipfs/js-ipfs-http-client/issues", + "license": "MIT", "leadMaintainer": "Alan Shaw ", + "files": [ + "src", + "dist" + ], "main": "src/index.js", "browser": { "glob": false, "fs": false, "stream": "readable-stream" }, - "files": [ - "src", - "dist" - ], + "repository": "github:ipfs/js-ipfs-http-client", "scripts": { "test": "aegir test", "test:node": "aegir test -t node", @@ -40,6 +47,7 @@ "flatmap": "0.0.3", "glob": "^7.1.3", "ipfs-block": "~0.8.1", + "ipfs-utils": "~0.0.3", "ipld-dag-cbor": "~0.15.0", "ipld-dag-pb": "~0.17.3", "is-ipfs": "~0.6.1", @@ -47,7 +55,6 @@ "is-stream": "^2.0.0", "iso-stream-http": "~0.1.2", "iso-url": "~0.4.6", - "ipfs-utils": "~0.0.3", "just-kebab-case": "^1.1.0", "just-map-keys": "^1.1.0", "kind-of": "^6.0.2", @@ -71,16 +78,8 @@ "tar-stream": "^2.0.1", "through2": "^3.0.1" }, - "engines": { - "node": ">=8.3.0", - "npm": ">=3.0.0" - }, - "repository": { - "type": "git", - "url": "https://github.com/ipfs/js-ipfs-http-client" - }, "devDependencies": { - "aegir": "^18.2.2", + "aegir": "ipfs/aegir", "browser-process-platform": "~0.1.1", "chai": "^4.2.0", "cross-env": "^5.2.0", @@ -91,9 +90,10 @@ "nock": "^10.0.2", "stream-equal": "^1.1.1" }, - "keywords": [ - "ipfs" - ], + "engines": { + "node": ">=8.3.0", + "npm": ">=3.0.0" + }, "contributors": [ "Alan Shaw ", "Alan Shaw ", @@ -184,10 +184,5 @@ "victorbjelkholm ", "Łukasz Magiera ", "Łukasz Magiera " - ], - "license": "MIT", - "bugs": { - "url": "https://github.com/ipfs/js-ipfs-http-client/issues" - }, - "homepage": "https://github.com/ipfs/js-ipfs-http-client" + ] } diff --git a/test/constructor.spec.js b/test/constructor.spec.js index af77d18e1..c138b7fb0 100644 --- a/test/constructor.spec.js +++ b/test/constructor.spec.js @@ -143,8 +143,8 @@ function clientWorks (client, done) { function expectConfig (ipfs, { host, port, protocol, apiPath }) { const conf = ipfs.getEndpointConfig() - expect(conf.host).to.equal(host || 'localhost') - expect(conf.port).to.equal(port || '5001') + expect(conf.host).to.be.oneOf([host, 'localhost', '']) + expect(conf.port).to.be.oneOf([port, '5001', 80]) expect(conf.protocol).to.equal(protocol || 'http') expect(conf['api-path']).to.equal(apiPath || '/api/v0/') } From 46854a84f8e7790ec88a18736e52976e6b2e1c3b Mon Sep 17 00:00:00 2001 From: Hugo Dias Date: Fri, 24 May 2019 17:29:38 +0100 Subject: [PATCH 02/10] chore: tweak node version in ci --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 20fccf3e6..961c5f4d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,8 @@ stages: - cov node_js: - - '12' - '10' - - '8' + - '12' os: - linux From b5755cd3e5d6df4e264a4f86912c3c88c29f9c1f Mon Sep 17 00:00:00 2001 From: Hugo Dias Date: Fri, 24 May 2019 17:47:30 +0100 Subject: [PATCH 03/10] chore: test electron --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 961c5f4d9..dd45f6bf3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,10 @@ jobs: - stage: test name: electron + addons: + apt: + packages: + - xvfb before_script: - export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start script: From 7c4b766b41b066ed1846087e9062d7d3f9af224a Mon Sep 17 00:00:00 2001 From: Hugo Dias Date: Fri, 24 May 2019 17:55:33 +0100 Subject: [PATCH 04/10] chore: test electron 2 --- .travis.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd45f6bf3..1b6e09a3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,12 +42,9 @@ jobs: - stage: test name: electron - addons: - apt: - packages: - - xvfb - before_script: - - export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start + install: + - export DISPLAY=':99.0' + - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & script: - npx aegir test -t electron-main - npx aegir test -t electron-renderer From 570971385ea85fb3e9f5a322aa6dfba43da3ff83 Mon Sep 17 00:00:00 2001 From: Hugo Dias Date: Fri, 24 May 2019 18:15:43 +0100 Subject: [PATCH 05/10] chore: upgrade aegir --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 66c86c924..4e3d34d05 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "through2": "^3.0.1" }, "devDependencies": { - "aegir": "ipfs/aegir", + "aegir": "^19.0.3", "browser-process-platform": "~0.1.1", "chai": "^4.2.0", "cross-env": "^5.2.0", From 23ac45706c7f51e3225ceed73022b05a7fab839a Mon Sep 17 00:00:00 2001 From: Hugo Dias Date: Mon, 3 Jun 2019 16:24:39 +0100 Subject: [PATCH 06/10] chore: fix electron ci test --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1b6e09a3a..d9bf1afac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,12 +42,9 @@ jobs: - stage: test name: electron - install: - - export DISPLAY=':99.0' - - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & script: - - npx aegir test -t electron-main - - npx aegir test -t electron-renderer + - xvfb-run npx aegir test -t electron-main + - xvfb-run npx aegir test -t electron-renderer notifications: email: false From 890fcd0d371f446c4f89c8441d69b44f5afd6760 Mon Sep 17 00:00:00 2001 From: Hugo Dias Date: Mon, 3 Jun 2019 17:05:44 +0100 Subject: [PATCH 07/10] chore: fix ci tests --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d9bf1afac..d4c5c4085 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,10 +41,14 @@ jobs: script: npx aegir test -t browser -t webworker -- --browsers FirefoxHeadless - stage: test - name: electron + name: electron-main script: - - xvfb-run npx aegir test -t electron-main - - xvfb-run npx aegir test -t electron-renderer + - xvfb-run npx aegir test -t electron-main -- --bail + + - stage: test + name: electron-renderer + script: + - xvfb-run npx aegir test -t electron-renderer -- --bail notifications: email: false From 38f5bc4b9c27e9fd5f30995b85ae7e503ed0b902 Mon Sep 17 00:00:00 2001 From: Hugo Dias Date: Mon, 3 Jun 2019 18:04:07 +0100 Subject: [PATCH 08/10] chore: allow fail electron-renderer --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d4c5c4085..3901421c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,7 @@ jobs: - stage: test name: electron-renderer + allow_failures: true script: - xvfb-run npx aegir test -t electron-renderer -- --bail From 7b32715d7c16c20fe299eef8f78355e829322838 Mon Sep 17 00:00:00 2001 From: Hugo Dias Date: Tue, 4 Jun 2019 10:27:15 +0100 Subject: [PATCH 09/10] chore: test allow failure --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3901421c0..0621635cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,9 @@ jobs: - os: windows filter_secrets: false cache: false + + - allow_failures: + - name: electron-renderer - stage: check script: @@ -47,7 +50,6 @@ jobs: - stage: test name: electron-renderer - allow_failures: true script: - xvfb-run npx aegir test -t electron-renderer -- --bail From 6a7dfb8e8332e0ab443b76bd6af2200266a76db1 Mon Sep 17 00:00:00 2001 From: Hugo Dias Date: Tue, 4 Jun 2019 11:06:44 +0100 Subject: [PATCH 10/10] chore: test allow failure 2 --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0621635cd..1368eb6eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,13 +17,16 @@ script: npx nyc -s npm run test:node -- --bail after_success: npx nyc report --reporter=text-lcov > coverage.lcov && npx codecov jobs: + allow_failures: + - name: electron-renderer + + fast_finish: true + include: - os: windows filter_secrets: false cache: false - - allow_failures: - - name: electron-renderer - stage: check script: