From f3a3507508ac5ea2b91a29e35a3ae077f0604261 Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Sun, 8 Nov 2020 14:10:10 -0400 Subject: [PATCH 1/6] use forked node-abi to get right versions from prebuild --- package-lock.json | 34 ++++++++++++++++++++++++++-------- package.json | 2 +- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 59d63082..9be769cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,15 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@shiftkey/node-abi": { + "version": "2.19.2-pre", + "resolved": "https://registry.npmjs.org/@shiftkey/node-abi/-/node-abi-2.19.2-pre.tgz", + "integrity": "sha512-+LfXo6nd2uZ8cGSJ66zL3OuddvG2oMWMc9GzpDoX2ZNMLmYpu+ReoEKXtmoKVwd6JSavDymldebCxSJh9NQ9cg==", + "dev": true, + "requires": { + "semver": "^5.4.1" + } + }, "@ungap/promise-all-settled": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", @@ -2196,14 +2205,6 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, - "node-abi": { - "version": "2.19.1", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.1.tgz", - "integrity": "sha512-HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A==", - "requires": { - "semver": "^5.4.1" - } - }, "node-addon-api": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz", @@ -2661,6 +2662,15 @@ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, + "node-abi": { + "version": "2.19.1", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.1.tgz", + "integrity": "sha512-HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A==", + "dev": true, + "requires": { + "semver": "^5.4.1" + } + }, "node-gyp": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-6.1.0.tgz", @@ -2708,6 +2718,14 @@ "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, + "node-abi": { + "version": "2.19.1", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.1.tgz", + "integrity": "sha512-HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A==", + "requires": { + "semver": "^5.4.1" + } } } }, diff --git a/package.json b/package.json index 4e68ec30..46bc10ec 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "babel-plugin-transform-async-to-generator": "^6.24.1", "chai": "^4.2.0", "mocha": "^8.0.1", - "node-abi": "^2.17.0", + "@shiftkey/node-abi": "2.19.2-pre", "node-cpplint": "~0.4.0", "node-gyp": "^7.0.0", "prebuild": "^10.0.0" From fb952187e3e36a45935dce03c63f3fb65c2f98b6 Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Sun, 8 Nov 2020 14:44:25 -0400 Subject: [PATCH 2/6] use github syntax to point to good version --- package-lock.json | 17 ++++++++--------- package.json | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9be769cc..9ae4e707 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,15 +4,6 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@shiftkey/node-abi": { - "version": "2.19.2-pre", - "resolved": "https://registry.npmjs.org/@shiftkey/node-abi/-/node-abi-2.19.2-pre.tgz", - "integrity": "sha512-+LfXo6nd2uZ8cGSJ66zL3OuddvG2oMWMc9GzpDoX2ZNMLmYpu+ReoEKXtmoKVwd6JSavDymldebCxSJh9NQ9cg==", - "dev": true, - "requires": { - "semver": "^5.4.1" - } - }, "@ungap/promise-all-settled": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", @@ -2205,6 +2196,14 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, + "node-abi": { + "version": "github:shiftkey/node-abi#abe2c8b66c269345bd1cbf3b5f25d5714cf19dc7", + "from": "github:shiftkey/node-abi#abe2c8b66c269345bd1cbf3b5f25d5714cf19dc7", + "dev": true, + "requires": { + "semver": "^5.4.1" + } + }, "node-addon-api": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz", diff --git a/package.json b/package.json index 46bc10ec..59ec43f4 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "babel-plugin-transform-async-to-generator": "^6.24.1", "chai": "^4.2.0", "mocha": "^8.0.1", - "@shiftkey/node-abi": "2.19.2-pre", + "node-abi": "shiftkey/node-abi#abe2c8b66c269345bd1cbf3b5f25d5714cf19dc7", "node-cpplint": "~0.4.0", "node-gyp": "^7.0.0", "prebuild": "^10.0.0" From b582e54aab4034cb314d6281c004f9b42bdb6dda Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Sun, 8 Nov 2020 14:53:05 -0400 Subject: [PATCH 3/6] bump to support prebuild output for Node 15 --- .travis.yml | 2 +- appveyor.yml | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 907695f6..d079b8b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ dist: trusty os: - linux - osx -node_js: 14 +node_js: 15 env: - CC=clang CXX=clang++ npm_config_clang=1 diff --git a/appveyor.yml b/appveyor.yml index 58d15e35..27a7a144 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ platform: - x64 environment: - nodejs_version: "14" + nodejs_version: "15" cache: - node_modules diff --git a/package.json b/package.json index 59ec43f4..9733e64c 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "lint": "npm run cpplint", "cpplint": "node-cpplint --filters legal-copyright,build-include,build-namespaces src/*.cc", "test": "npm run lint && npm build . && mocha --require babel-core/register spec/", - "prebuild-node": "prebuild -t 8.9.0 -t 9.4.0 -t 10.11.0 -t 11.9.0 -t 12.0.0 -t 13.0.0 -t 14.0.0 --strip", + "prebuild-node": "prebuild -t 8.9.0 -t 9.4.0 -t 10.11.0 -t 11.9.0 -t 12.0.0 -t 13.0.0 -t 14.0.0 -t 15.0.0 --strip", "prebuild-node-ia32": "prebuild -t 8.9.0 -t 9.4.0 -a ia32 --strip", "prebuild-electron": "prebuild -t 7.0.0 -t 8.0.0 -t 9.0.0 -t 10.0.0 -r electron --strip", "prebuild-electron-arm64": "prebuild -t 7.0.0 -t 8.0.0 -t 9.0.0 -t 10.0.0 -r electron -a arm64 --strip", From c28bc59476abe1230e085fc3b9dd6e1f7a92f87a Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Sun, 8 Nov 2020 15:01:40 -0400 Subject: [PATCH 4/6] fall back to non-default way of installing unsupported node version --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 27a7a144..2a85a35a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,7 +17,7 @@ branches: clone_depth: 10 install: - - ps: Install-Product node $env:nodejs_version x64 + - ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) $env:PLATFORM - npm install build_script: From ac250ce6d557a1de9f32728d6488d47f71a2f118 Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Sun, 8 Nov 2020 15:09:43 -0400 Subject: [PATCH 5/6] dump contents of prebuild directory when done --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 2a85a35a..0da6aa5b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,6 +28,7 @@ build_script: - npm run prebuild-electron-ia32 - npm run prebuild-electron-arm64 - if defined APPVEYOR_REPO_TAG_NAME (npm run upload) + - ls prebuilds/ test: off deploy: off From 5c8b70b5ab854818859feb946507ae09c58d0fc7 Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Sun, 8 Nov 2020 15:22:08 -0400 Subject: [PATCH 6/6] is this the right syntax? --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9733e64c..8cd2baa6 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "babel-plugin-transform-async-to-generator": "^6.24.1", "chai": "^4.2.0", "mocha": "^8.0.1", - "node-abi": "shiftkey/node-abi#abe2c8b66c269345bd1cbf3b5f25d5714cf19dc7", + "node-abi": "github:shiftkey/node-abi#abe2c8b66c269345bd1cbf3b5f25d5714cf19dc7", "node-cpplint": "~0.4.0", "node-gyp": "^7.0.0", "prebuild": "^10.0.0"