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

fix: update node-addon-api, node-gyp, and node #588

Merged
merged 29 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0eca668
6.0.0-beta.17
pshenmic Nov 15, 2023
e063379
Merge remote-tracking branch 'origin/tweetNacl'
pshenmic Nov 15, 2023
586304a
6.0.0-beta.18
pshenmic Nov 15, 2023
d6d61cc
Add .idea to .gitignore
pshenmic Nov 15, 2023
508f7fd
Change scope
pshenmic Nov 15, 2023
78f3d1f
Bump node-gyp to the latest
pshenmic Nov 16, 2023
e4ad615
Bump package version
pshenmic Nov 16, 2023
afe5a26
Revert bump
pshenmic Nov 16, 2023
275a14a
6.0.0-beta.19
pshenmic Nov 16, 2023
7370c96
Disable tests on CI
pshenmic Nov 16, 2023
85fd83f
Bump node-addon-api
pshenmic Nov 16, 2023
7a53f9c
Bump deasync
pshenmic Nov 16, 2023
140d535
Update pnpm lock
pshenmic Nov 16, 2023
d239845
Upgrade pnpm version
pshenmic Nov 16, 2023
dbb64db
Override node-gyp version to 10.0.1
pshenmic Nov 16, 2023
5a9029a
Try to global install correct node-gyp
pshenmic Nov 16, 2023
ca14130
Move to the Install Dependencies
pshenmic Nov 16, 2023
a1b479d
Add global flag
pshenmic Nov 16, 2023
bac21f5
Bump macos version
pshenmic Nov 16, 2023
250109e
Bump macos version for arm64
pshenmic Nov 16, 2023
d6326ec
Remove Node caching
pshenmic Nov 16, 2023
eeaac3e
Upgrade to 13 macos
pshenmic Nov 16, 2023
32521b2
Remove resolution
pshenmic Nov 16, 2023
6273e24
Update pnpm lock
pshenmic Nov 16, 2023
7f9d480
6.0.0-beta.20
pshenmic Nov 16, 2023
ddbb36f
Merge remote-tracking branch 'zeromq/master' into feat/fix-ci-builds
pshenmic Nov 16, 2023
ebefa08
Revert disable tests
pshenmic Nov 16, 2023
a3fb94f
Revert after debug
pshenmic Nov 16, 2023
78dec36
Get back node-gyp override
pshenmic Nov 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading
Loading