Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update node-gyp #1152

Closed
wants to merge 19 commits into from
32 changes: 3 additions & 29 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,6 @@ workflows:
name: test-<< matrix.executor >>-<< matrix.node-version >>
pre-steps:
- run: git config --global core.autocrlf input
- when:
condition:
or:
- and:
- equal: [ node/macos, << matrix.executor >> ]
- equal: [ '14.16', << matrix.node-version >> ]
- and:
- equal: [ node/macos, << matrix.executor >> ]
- equal: [ '12.22', << matrix.node-version >> ]
steps:
- node/install-rosetta
- when:
condition:
equal: [ windows, << matrix.executor >> ]
Expand All @@ -41,14 +30,6 @@ workflows:
command: New-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" -Name "LongPathsEnabled" -Value 1 -PropertyType DWORD -Force
shell: powershell.exe
test-steps:
- when:
condition:
or:
- equal: [ '14.16', << matrix.node-version >> ]
- equal: [ '12.22', << matrix.node-version >> ]
steps:
# Update npm so it works with latest Python 3
- run: npm install -g npm@8
- run: yarn run lint
- run:
name: Tests with code coverage
Expand All @@ -65,17 +46,10 @@ workflows:
- node/macos
- windows
node-version:
- '20.9'
- '18.17'
- '22.8'
- '20.17'
- '18.20'
- '16.20'
# Stay below 14.17.0 or nvm tries to download arm64 artifacts which don't exist
- '14.16'
- '12.22'
exclude:
- executor: windows
node-version: '14.16'
- executor: windows
node-version: '12.22'
- cfa/release:
requires:
- test
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@
"detect-libc": "^2.0.1",
"fs-extra": "^10.0.0",
"got": "^11.7.0",
"node-abi": "^3.45.0",
"node-abi": "^3.67.0",
"node-api-version": "^0.2.0",
"node-gyp": "^9.0.0",
"node-gyp": "^10.2.0",
"ora": "^5.1.0",
"read-binary-file-arch": "^1.0.6",
"semver": "^7.3.5",
"tar": "^6.0.5",
"yargs": "^17.0.1"
},
"devDependencies": {
"@istanbuljs/nyc-config-typescript": "^1.0.1",
"@istanbuljs/nyc-config-typescript": "^1.0.2",
"@types/chai": "^4.2.12",
"@types/chai-as-promised": "^7.1.3",
"@types/debug": "^4.1.5",
Expand All @@ -64,7 +64,7 @@
"@types/node": "^17.0.8",
"@types/node-abi": "^3.0.0",
"@types/semver": "^7.3.9",
"@types/tar": "^6.1.0",
"@types/tar": "^6.1.13",
"@types/yargs": "^17.0.2",
"@typescript-eslint/eslint-plugin": "^4.0.1",
"@typescript-eslint/parser": "^4.0.1",
Expand Down
3 changes: 1 addition & 2 deletions src/module-type/node-gyp/worker.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import NodeGypRunner from 'node-gyp';
import { promisify } from 'util';

process.on('message', async ({
nodeGypArgs,
Expand All @@ -23,7 +22,7 @@ process.on('message', async ({
});
}
}
await promisify(nodeGyp.commands[command.name])(command.args);
await nodeGyp.commands[command.name](command.args);
command = nodeGyp.todo.shift();
}
process.exit(0);
Expand Down
8 changes: 4 additions & 4 deletions test/fixture/native-app1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
},
"devDependencies": {
"@types/node": "^12.0.10",
"ffi-napi": "4.0.3"
"koffi": "^2.9.0"
},
"##": "sqlite3 >5.1.7 do not use node-pre-gyp anymore",
"dependencies": {
"@newrelic/native-metrics": "5.3.0",
"@newrelic/native-metrics": "10.2.0",
"farmhash": "3.2.1",
"level": "6.0.0",
"native-hello-world": "2.0.0",
"ref-napi": "1.4.2",
"leveldown": "^6.1.1",
"sqlite3": "5.1.6"
},
"optionalDependencies": {
Expand Down
Loading