From 3c38e7d56662784b2b1ad9d5c700315aab7a5852 Mon Sep 17 00:00:00 2001 From: Croydon Date: Fri, 27 Jul 2018 01:36:36 +0200 Subject: [PATCH 01/10] Drop support for Node.js 4 as it is EOL --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1243ed56e..9b5550df9 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "lib": "./lib" }, "engines": { - "node": ">= 4" + "node": ">= 6" }, "dependencies": { "fs-extra": "^7.0.0", From 933ae6f1a8862b084fdaa29e957b35fab7a13b6a Mon Sep 17 00:00:00 2001 From: Croydon Date: Fri, 28 Sep 2018 20:51:36 +0200 Subject: [PATCH 02/10] Update lodash to 4.17.11 --- package-lock.json | 57 ++++++++++++++++++++++++++++++++++------------- package.json | 2 +- 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8829e45ce..f3ce9f804 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2486,9 +2486,9 @@ } }, "glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -2757,7 +2757,7 @@ }, "readable-stream": { "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "dev": true, "requires": { @@ -3443,6 +3443,13 @@ "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } } }, "minizlib": { @@ -3503,7 +3510,7 @@ "dependencies": { "commander": { "version": "2.15.1", - "resolved": "http://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", "dev": true }, @@ -3601,13 +3608,20 @@ } }, "needle": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.3.tgz", - "integrity": "sha512-GPL22d/U9cai87FcCPO6e+MT3vyHS2j+zwotakDc7kE2DtUAqFKMXLJCTtRp+5S75vXIwQPvIxkvlctxf9q4gQ==", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz", + "integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==", "requires": { "debug": "^2.1.2", "iconv-lite": "^0.4.4", "sax": "^1.2.4" + }, + "dependencies": { + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + } } }, "node-gyp": { @@ -3655,6 +3669,11 @@ "osenv": "^0.1.4" } }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, "tar": { "version": "4.4.6", "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.6.tgz", @@ -4179,7 +4198,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" } } @@ -4666,6 +4685,13 @@ "tough-cookie": "~2.4.3", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } } }, "request-progress": { @@ -4732,9 +4758,9 @@ } }, "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" }, "safe-regex": { "version": "1.1.0", @@ -4751,9 +4777,10 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", + "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o=", + "dev": true }, "semver": { "version": "5.3.0", diff --git a/package.json b/package.json index 9b5550df9..443a09e5a 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ }, "dependencies": { "fs-extra": "^7.0.0", - "lodash": "^4.13.1", + "lodash": "^4.17.11", "nan": "^2.10.0", "node-gyp": "^3.8.0", "node-pre-gyp": "^0.11.0", From 1f44e1371ead1c657ea0c31845a7f15629e11271 Mon Sep 17 00:00:00 2001 From: Croydon Date: Fri, 27 Jul 2018 03:51:47 +0200 Subject: [PATCH 03/10] Travis: Make a failure an actual failure --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a95787ea4..d59a13966 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,7 @@ before_install: fi install: + - set -e; - travis_retry npm install; # This is a random private key used purely for testing. From bdb694222120285649c4943544a7bd84f0b84a29 Mon Sep 17 00:00:00 2001 From: Croydon Date: Sun, 29 Jul 2018 00:32:40 +0200 Subject: [PATCH 04/10] AppVeyor: Chores --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e9b9a1bd5..4e0159846 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ # appveyor file -# http://www.appveyor.com/docs/appveyor-yml +# https://www.appveyor.com/docs/appveyor-yml/ image: Visual Studio 2015 @@ -13,7 +13,7 @@ version: "{build}" # Set a known clone folder clone_folder: c:\projects\nodegit -# fix lineendings in Windows +# fix line endings in Windows init: - git config --global core.autocrlf input - git config --global user.name "John Doe" @@ -39,7 +39,7 @@ install: - ps: Install-Product node $env:nodejs_version $env:platform - ps: Start-Process c:\projects\nodegit\vendor\pageant.exe c:\projects\nodegit\vendor\private.ppk - npm install -g npm - - cmd: npm install -g node-gyp + - npm install -g node-gyp - appveyor-retry call npm install test_script: From 419724073bc64241a6a4442d25e73395684d2ae7 Mon Sep 17 00:00:00 2001 From: Croydon Date: Fri, 28 Sep 2018 20:43:48 +0200 Subject: [PATCH 05/10] AppVeyor: Build with newer Node versions first --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4e0159846..34f73e23d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,9 +26,9 @@ environment: GYP_MSVS_VERSION: 2015 matrix: # Node.js - - nodejs_version: "6" - - nodejs_version: "8" - nodejs_version: "10" + - nodejs_version: "8" + - nodejs_version: "6" matrix: fast_finish: true From 6e5715ccd5d3f82c5ac99eef72232e5e5ceb5df8 Mon Sep 17 00:00:00 2001 From: Croydon Date: Fri, 28 Sep 2018 20:54:54 +0200 Subject: [PATCH 06/10] Chores --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 443a09e5a..7bd9932ae 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "walk": "^2.3.9" }, "vendorDependencies": { - "libssh2": "1.7.0", + "libssh2": "1.8.0", "http_parser": "2.5.0" }, "binary": { From 77aded7b517658770a972a14b435b2945396ae8b Mon Sep 17 00:00:00 2001 From: Croydon Date: Fri, 21 Sep 2018 02:11:16 +0200 Subject: [PATCH 07/10] Travis: Build downloads on Trusty Dear future contributors, please update this in April 2019 when Trusty becomes EOL. Keep extended testing and documentation upload on Xenial as it is easier there to install required dependencies and other nice perks. Also don't allow Node 10 to fail anymore. --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d59a13966..c09531d9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ -sudo: false +sudo: true +# update to Xenial in April 2019; Trusty will be EOL, Xenial new minimum supported OS version +dist: trusty branches: only: @@ -34,10 +36,12 @@ jobs: include: - stage: "Extended testing" os: linux + dist: xenial node_js: "8" env: TARGET_ARCH="x64" EXTENDED_TESTING="false" - stage: "Deploy documentation" os: linux + dist: xenial node_js: "8" env: TARGET_ARCH="x64" DEPLOY_DOCUMENTATION="true" From ee480afcf0a4838621205406b89210aa1d82e442 Mon Sep 17 00:00:00 2001 From: Croydon Date: Fri, 28 Sep 2018 00:57:33 +0200 Subject: [PATCH 08/10] Update nan to 2.11.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7bd9932ae..f460f66e7 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "dependencies": { "fs-extra": "^7.0.0", "lodash": "^4.17.11", - "nan": "^2.10.0", + "nan": "^2.11.0", "node-gyp": "^3.8.0", "node-pre-gyp": "^0.11.0", "promisify-node": "~0.3.0", From 99eccc9e9af2c678e827a0327a98b491f994f46a Mon Sep 17 00:00:00 2001 From: Croydon Date: Tue, 2 Oct 2018 03:20:11 +0200 Subject: [PATCH 09/10] Chore: Package updates --- package-lock.json | 24 +++++++++--------------- package.json | 4 ++-- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index f3ce9f804..a6eb111a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -165,9 +165,9 @@ "dev": true }, "aws-sdk": { - "version": "2.315.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.315.0.tgz", - "integrity": "sha512-GqKve4H6DCpPG7zm5L5S5Is50AnRHbBei1kKFhUKj4KfB7lV/0OIVfjob2Jh4a6I4I1tqnTcdTXGlhBccS1f3w==", + "version": "2.326.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.326.0.tgz", + "integrity": "sha512-R8CzUxH7TKsmQTT59CoXGQSXYscmc5TiU/OXb/R0xq1WYEngiznBy+J+cahJOjugSjN+5VQWTGbEzBC3Bc75kQ==", "dev": true, "requires": { "buffer": "4.9.1", @@ -181,12 +181,6 @@ "xml2js": "0.4.19" }, "dependencies": { - "sax": { - "version": "1.2.1", - "resolved": "http://registry.npmjs.org/sax/-/sax-1.2.1.tgz", - "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o=", - "dev": true - }, "uuid": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", @@ -925,7 +919,7 @@ }, "buffer": { "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "dev": true, "requires": { @@ -1662,7 +1656,7 @@ }, "events": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", + "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz", "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", "dev": true }, @@ -3560,9 +3554,9 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "nan": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz", - "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==" + "version": "2.11.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz", + "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==" }, "nanomatch": { "version": "1.2.13", @@ -4778,7 +4772,7 @@ }, "sax": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", + "resolved": "http://registry.npmjs.org/sax/-/sax-1.2.1.tgz", "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o=", "dev": true }, diff --git a/package.json b/package.json index f460f66e7..23caed31a 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "dependencies": { "fs-extra": "^7.0.0", "lodash": "^4.17.11", - "nan": "^2.11.0", + "nan": "^2.11.1", "node-gyp": "^3.8.0", "node-pre-gyp": "^0.11.0", "promisify-node": "~0.3.0", @@ -49,7 +49,7 @@ "tar-fs": "^1.16.3" }, "devDependencies": { - "aws-sdk": "^2.3.19", + "aws-sdk": "^2.326.0", "babel-cli": "^6.7.7", "babel-preset-es2015": "^6.6.0", "cheerio": "^1.0.0-rc.2", From e42502f8ce0a23cca477fbeca450773ea82aa39a Mon Sep 17 00:00:00 2001 From: Croydon Date: Tue, 2 Oct 2018 03:20:23 +0200 Subject: [PATCH 10/10] Travis: Sudo is not needed --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c09531d9f..81ecddf4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -sudo: true +sudo: false # update to Xenial in April 2019; Trusty will be EOL, Xenial new minimum supported OS version dist: trusty