Skip to content

Commit 3f0170d

Browse files
aminyapshenmic
andcommitted
Merge pull request #588 from pshenmic/feat/fix-ci-builds
fix: update node-addon-api, node-gyp, and node Co-Authored-By: pshenmic <[email protected]>
1 parent d56a847 commit 3f0170d

File tree

4 files changed

+251
-238
lines changed

4 files changed

+251
-238
lines changed

.github/workflows/CI.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- ubuntu-20.04
1818
- windows-2022
1919
node_version:
20-
- 18
20+
- 20
2121
node_arch:
2222
- x64
2323
cpp_arch:
@@ -33,38 +33,38 @@ jobs:
3333

3434
include:
3535
- os: windows-2022
36-
node_version: 18
36+
node_version: 20
3737
node_arch: x86
3838
ARCH: x86
3939
cpp_arch: amd64_x86
4040
zmq_draft: false
4141

4242
# - os: windows-2022
43-
# node_version: 18
43+
# node_version: 20
4444
# node_arch: x64
4545
# ARCH: arm64
4646
# cpp_arch: amd64_arm64
4747
# zmq_draft: false
4848

49-
- os: macos-11
50-
node_version: 18
49+
- os: macos-13
50+
node_version: 20
5151
node_arch: x64
5252
ARCH: x86_64
5353
cpp_arch: x64
5454
zmq_draft: false
5555

56-
- os: macos-11
57-
node_version: 18
56+
- os: macos-13
57+
node_version: 20
5858
node_arch: x64
5959
ARCH: arm64
6060
cpp_arch: amd64_arm64
6161
zmq_draft: false
6262

6363
# Alpine
6464
- os: ubuntu-22.04
65-
docker: node:18-alpine
65+
docker: node:20-alpine
6666
docker_cmd: apk add --no-cache pkgconfig curl tar python3 make gcc g++ cmake musl-dev && npm i -g pnpm && pnpm install && pnpm run prebuild
67-
node_version: 18
67+
node_version: 20
6868
node_arch: x64
6969
ARCH: x64
7070
cpp_arch: x64
@@ -99,15 +99,14 @@ jobs:
9999
- uses: pnpm/[email protected]
100100
if: ${{ !matrix.docker }}
101101
with:
102-
version: 7
102+
version: 8
103103

104104
- name: Install Node
105105
if: ${{ !matrix.docker }}
106106
uses: actions/setup-node@v3
107107
with:
108108
node-version: ${{ matrix.node_version }}
109109
architecture: ${{ matrix.node_arch }}
110-
cache: "pnpm"
111110

112111
- name: Install Mac-OS x86_64 Dependencies
113112
if: ${{ contains(matrix.os, 'macos') && matrix.ARCH == 'x86_64' }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ test/typings-compatibility/
2222
tsconfig.tsbuildinfo
2323
/docs-raw
2424
.DS_Store
25+
.idea

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"dependencies": {
2121
"@aminya/node-gyp-build": "4.5.0-aminya.4",
2222
"cross-env": "^7.0.3",
23-
"node-addon-api": "^6.0.0",
23+
"node-addon-api": "^7.0.0",
2424
"shelljs": "^0.8.5",
2525
"shx": "^0.3.4"
2626
},
@@ -35,7 +35,7 @@
3535
"@types/which": "^2.0.1",
3636
"benchmark": "^2.1.4",
3737
"chai": "^4.3.7",
38-
"deasync": "^0.1.28",
38+
"deasync": "^0.1.29",
3939
"downlevel-dts": "^0.11.0",
4040
"electron-mocha": "^11.0.2",
4141
"eslint-config-atomic": "^1.18.1",
@@ -44,7 +44,7 @@
4444
"gh-pages": "^4.0.0",
4545
"minify-all-cli": "^1.0.13",
4646
"mocha": "^10.1.0",
47-
"node-gyp": "^9.3.0",
47+
"node-gyp": "^10.0.1",
4848
"npm-run-all2": "^6.0.4",
4949
"prebuildify": "^5.0.1",
5050
"prettier": "^2.8.0",
@@ -58,7 +58,8 @@
5858
},
5959
"pnpm": {
6060
"overrides": {
61-
"typescript": "~4.9.3"
61+
"typescript": "~4.9.3",
62+
"node-gyp": "10.0.1"
6263
}
6364
},
6465
"engines": {

0 commit comments

Comments
 (0)