From f34b6a2ba09426928ce0359d57231b8be04f9ac7 Mon Sep 17 00:00:00 2001 From: Victor Bjelkholm Date: Thu, 14 Dec 2017 17:10:33 +0100 Subject: [PATCH 1/5] Updating CI files This commit updates all CI scripts to the latest version --- .travis.yml | 2 ++ appveyor.yml | 25 ++++++++++++++----------- ci/Jenkinsfile | 2 ++ circle.yml | 5 +---- 4 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 ci/Jenkinsfile diff --git a/.travis.yml b/.travis.yml index c5ed64e0d..5102ee5ff 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 @@ -13,6 +14,7 @@ matrix: script: - npm run lint - npm run test + - npm run coverage before_script: - export DISPLAY=:99.0 diff --git a/appveyor.yml b/appveyor.yml index ba93339ba..046bf9108 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,26 +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" -init: - - git config --global core.autocrlf input +matrix: + fast_finish: true -# cache: -# - node_modules +install: + # Install Node.js + - ps: Install-Product node $env:nodejs_version -platform: - - x64 + # Upgrade npm + - npm install -g npm -install: - - ps: Install-Product node $env:nodejs_version $env:platform + # Output our current versions for debugging - node --version - npm --version + + # Install our package dependencies - npm install test_script: - - npm test + - npm run test:node build: off - -version: "{build}" diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile new file mode 100644 index 000000000..a7da2e54f --- /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/circle.yml b/circle.yml index d67b6ae70..00096937f 100644 --- a/circle.yml +++ b/circle.yml @@ -1,11 +1,8 @@ +# 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 - dependencies: pre: - google-chrome --version From 384acdda297c5b767b2004860240fac3f2dadfc8 Mon Sep 17 00:00:00 2001 From: Richard Schneider Date: Sat, 16 Dec 2017 08:01:31 +1300 Subject: [PATCH 2/5] fix: appveyor should preserve line endings --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 046bf9108..2119a2fc3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,9 @@ # 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}" +init: + - git config --global core.autocrlf input + environment: matrix: - nodejs_version: "6" From c10938c3eba04a1f67ac2a56e2691c26f07c9490 Mon Sep 17 00:00:00 2001 From: Richard Schneider Date: Sat, 16 Dec 2017 08:17:07 +1300 Subject: [PATCH 3/5] fix: go-ipfs not available on x32 --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 2119a2fc3..fd4d54a3c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,9 @@ version: "{build}" init: - git config --global core.autocrlf input +platform: + - x64 + environment: matrix: - nodejs_version: "6" From 8bbb2886fd6203035b67206d0c687ff74c944359 Mon Sep 17 00:00:00 2001 From: Richard Schneider Date: Sat, 16 Dec 2017 09:58:51 +1300 Subject: [PATCH 4/5] chore: need debug output from unix --- test/refs.spec.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/refs.spec.js b/test/refs.spec.js index 9faedc905..c2c05fd92 100644 --- a/test/refs.spec.js +++ b/test/refs.spec.js @@ -29,8 +29,8 @@ describe('.refs', function () { ipfs.util.addFromFs(filesPath, { recursive: true }, cb) }, (hashes, cb) => { + console.log('hashes', hashes) folder = hashes[hashes.length - 1].hash - expect(folder).to.be.eql('QmQao3KNcpCsdXaLGpjieFGMfXzsSXgsf6Rnc5dJJA3QMh') cb() } ], done) @@ -38,6 +38,10 @@ describe('.refs', function () { after((done) => fc.dismantle(done)) + it('created the folder', () => { + expect(folder).to.be.eql('QmQao3KNcpCsdXaLGpjieFGMfXzsSXgsf6Rnc5dJJA3QMh') + }) + const result = [ { Ref: 'QmQao3KNcpCsdXaLGpjieFGMfXzsSXgsf6Rnc5dJJA3QMh QmcUYKmQxmTcFom4R4UZP7FWeQzgJkwcFn51XrvsMy7PE9 add', From 269387f2add2ad359c01723d7ab439a080f893fb Mon Sep 17 00:00:00 2001 From: Richard Schneider Date: Sat, 16 Dec 2017 11:44:17 +1300 Subject: [PATCH 5/5] fix: try forcing appveyor to use x64 vm --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index fd4d54a3c..c9441012b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,8 +4,7 @@ version: "{build}" init: - git config --global core.autocrlf input -platform: - - x64 +platform: x64 environment: matrix: