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..0da6aa5b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ platform: - x64 environment: - nodejs_version: "14" + nodejs_version: "15" cache: - node_modules @@ -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: @@ -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 diff --git a/package-lock.json b/package-lock.json index 59d63082..9ae4e707 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2197,9 +2197,9 @@ "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==", + "version": "github:shiftkey/node-abi#abe2c8b66c269345bd1cbf3b5f25d5714cf19dc7", + "from": "github:shiftkey/node-abi#abe2c8b66c269345bd1cbf3b5f25d5714cf19dc7", + "dev": true, "requires": { "semver": "^5.4.1" } @@ -2661,6 +2661,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 +2717,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..8cd2baa6 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", @@ -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", + "node-abi": "github:shiftkey/node-abi#abe2c8b66c269345bd1cbf3b5f25d5714cf19dc7", "node-cpplint": "~0.4.0", "node-gyp": "^7.0.0", "prebuild": "^10.0.0"