Skip to content

Commit

Permalink
Merge pull request #588 from pshenmic/feat/fix-ci-builds
Browse files Browse the repository at this point in the history
fix: update node-addon-api, node-gyp, and node
Co-Authored-By: pshenmic <pshenmic@gmail.com>
  • Loading branch information
aminya and pshenmic committed Nov 16, 2023
1 parent d56a847 commit 3f0170d
Show file tree
Hide file tree
Showing 4 changed files with 251 additions and 238 deletions.
21 changes: 10 additions & 11 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- ubuntu-20.04
- windows-2022
node_version:
- 18
- 20
node_arch:
- x64
cpp_arch:
Expand All @@ -33,38 +33,38 @@ jobs:

include:
- os: windows-2022
node_version: 18
node_version: 20
node_arch: x86
ARCH: x86
cpp_arch: amd64_x86
zmq_draft: false

# - os: windows-2022
# node_version: 18
# node_version: 20
# node_arch: x64
# ARCH: arm64
# cpp_arch: amd64_arm64
# zmq_draft: false

- os: macos-11
node_version: 18
- os: macos-13
node_version: 20
node_arch: x64
ARCH: x86_64
cpp_arch: x64
zmq_draft: false

- os: macos-11
node_version: 18
- os: macos-13
node_version: 20
node_arch: x64
ARCH: arm64
cpp_arch: amd64_arm64
zmq_draft: false

# Alpine
- os: ubuntu-22.04
docker: node:18-alpine
docker: node:20-alpine
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
node_version: 18
node_version: 20
node_arch: x64
ARCH: x64
cpp_arch: x64
Expand Down Expand Up @@ -99,15 +99,14 @@ jobs:
- uses: pnpm/action-setup@v2.2.4
if: ${{ !matrix.docker }}
with:
version: 7
version: 8

- name: Install Node
if: ${{ !matrix.docker }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node_version }}
architecture: ${{ matrix.node_arch }}
cache: "pnpm"

- name: Install Mac-OS x86_64 Dependencies
if: ${{ contains(matrix.os, 'macos') && matrix.ARCH == 'x86_64' }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ test/typings-compatibility/
tsconfig.tsbuildinfo
/docs-raw
.DS_Store
.idea
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"dependencies": {
"@aminya/node-gyp-build": "4.5.0-aminya.4",
"cross-env": "^7.0.3",
"node-addon-api": "^6.0.0",
"node-addon-api": "^7.0.0",
"shelljs": "^0.8.5",
"shx": "^0.3.4"
},
Expand All @@ -35,7 +35,7 @@
"@types/which": "^2.0.1",
"benchmark": "^2.1.4",
"chai": "^4.3.7",
"deasync": "^0.1.28",
"deasync": "^0.1.29",
"downlevel-dts": "^0.11.0",
"electron-mocha": "^11.0.2",
"eslint-config-atomic": "^1.18.1",
Expand All @@ -44,7 +44,7 @@
"gh-pages": "^4.0.0",
"minify-all-cli": "^1.0.13",
"mocha": "^10.1.0",
"node-gyp": "^9.3.0",
"node-gyp": "^10.0.1",
"npm-run-all2": "^6.0.4",
"prebuildify": "^5.0.1",
"prettier": "^2.8.0",
Expand All @@ -58,7 +58,8 @@
},
"pnpm": {
"overrides": {
"typescript": "~4.9.3"
"typescript": "~4.9.3",
"node-gyp": "10.0.1"
}
},
"engines": {
Expand Down

0 comments on commit 3f0170d

Please sign in to comment.