Skip to content

Commit b48fd6b

Browse files
committed
Merge branch 'master' into windows-arm
2 parents ea1d4df + 37b3fc6 commit b48fd6b

File tree

8 files changed

+106
-606
lines changed

8 files changed

+106
-606
lines changed

.github/workflows/CI.yml

+13-9
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
1111
runs-on: ${{ matrix.os }}
1212
# prettier-ignore
13-
name: ${{ matrix.os }}-${{ matrix.node_target_arch }}-${{ matrix.dockerfile }}-${{ matrix.distro }}
13+
name: ${{ matrix.os }}-${{ matrix.node_target_arch }}-${{ matrix.dockerfile }}-${{ matrix.distro }}-${{ matrix.base_image }}
1414
strategy:
1515
fail-fast: false
1616
matrix:
@@ -71,7 +71,8 @@ jobs:
7171

7272
# Debian Arm
7373
- os: ubuntu-24.04
74-
distro: bookworm
74+
distro: none
75+
base_image: aminya/setup-cpp-ubuntu-gcc:20.04-1.3.0
7576
node_arch: arm64
7677
node_target_arch: arm64
7778
cpp_arch: arm64
@@ -149,14 +150,14 @@ jobs:
149150
if: ${{ !matrix.vm }}
150151
run: pnpm run build.js
151152

152-
- name: Install Node 10
153+
- name: Install Node 12
153154
if: ${{ !matrix.vm && matrix.os != 'macos-14' }}
154155
uses: actions/setup-node@v4
155156
with:
156-
node-version: 10
157+
node-version: 12
157158
architecture: ${{ env.setup_node_arch }}
158159

159-
- name: Build Node 10 Native
160+
- name: Build Node 12 Native
160161
if: ${{ !matrix.vm }}
161162
run: node ./script/install.js
162163

@@ -187,21 +188,24 @@ jobs:
187188
188189
- name: Build Linux Arm64
189190
if: ${{ matrix.distro }}
190-
uses: uraimo/run-on-arch-action@v2.8.1
191+
uses: uraimo/run-on-arch-action@v3.0.0
191192
with:
192193
arch: aarch64
193194
distro: ${{ matrix.distro }}
195+
base_image: ${{ matrix.base_image }}
194196
githubToken: ${{ github.token }}
195197
setup: |
196198
mkdir -p "${PWD}/build"
197199
dockerRunArgs: |
198200
--volume "${PWD}/build:/build"
201+
shell: /bin/bash
199202
env: |
200203
VCPKG_FORCE_SYSTEM_BINARIES: 1
201204
install: |
202205
${{ steps.read-installer-script.outputs.install_deps }}
203206
204207
run: |
208+
(test -f $HOME/.cpprc && . $HOME/.cpprc || true) && \
205209
pnpm install && \
206210
pnpm run build
207211
@@ -300,7 +304,7 @@ jobs:
300304
- windows-2022
301305
- macos-13
302306
node-version:
303-
- 10
307+
- 12
304308
- 22
305309

306310
include:
@@ -313,7 +317,7 @@ jobs:
313317
node-version: ${{ matrix.node-version }}
314318

315319
- name: Install Yarn 1
316-
if: matrix.node-version == 10
320+
if: matrix.node-version == 12
317321
run: |
318322
npm i -g yarn@^1
319323
@@ -323,7 +327,7 @@ jobs:
323327
npm i -g yarn@latest
324328
325329
- name: Install Pnpm 5
326-
if: matrix.node-version == 10
330+
if: matrix.node-version == 12
327331
uses: pnpm/action-setup@v4
328332
with:
329333
version: 5

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ if(APPLE)
112112
endif()
113113

114114
run_vcpkg(VCPKG_URL "https://github.com/microsoft/vcpkg.git" VCPKG_REV
115-
"ee2d2a100103e0f3613c60655dcf15be7d5157b8")
115+
"608d1dbcd6969679f82b1ca6b89d58939c9b228e")
116116

117117
# Name of the project (will be the name of the plugin)
118118
project(addon LANGUAGES C CXX)

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ npm install zeromq
6767

6868
Supported versions:
6969

70-
- Node.js v10+ (requires a [N-API](https://nodejs.org/api/n-api.html))
70+
- Node.js v12+ (requires a [N-API](https://nodejs.org/api/n-api.html))
7171

7272
## Examples
7373

@@ -326,7 +326,7 @@ during build, you can build this package from source.
326326
Make sure you have the following installed before attempting to build from
327327
source:
328328

329-
- Node.js 10+ or Electron
329+
- Node.js 12+ or Electron
330330
- C++17 compiler toolchain (e.g. LLVM, GCC, MSVC)
331331
- Python 3
332332
- CMake 3.16+

package.json

+7-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"homepage": "http://zeromq.github.io/zeromq.js/",
2121
"dependencies": {
22-
"@aminya/cmake-ts": "^0.3.0-aminya.7",
22+
"cmake-ts": "^0.5.3",
2323
"node-addon-api": "^8.3.0"
2424
},
2525
"devDependencies": {
@@ -67,7 +67,7 @@
6767
"which": "^5.0.0"
6868
},
6969
"engines": {
70-
"node": ">= 10",
70+
"node": ">= 12",
7171
"pnpm": ">= 9"
7272
},
7373
"overrides": {
@@ -78,7 +78,11 @@
7878
"overrides": {
7979
"typescript": "~4.9.5",
8080
"node-gyp": "10.0.1"
81-
}
81+
},
82+
"onlyBuiltDependencies": [
83+
"core-js",
84+
"electron"
85+
]
8286
},
8387
"files": [
8488
"CHANGELOG.md",

0 commit comments

Comments
 (0)