diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 8c82cc7..e291bb1 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -45,12 +45,7 @@ jobs: - { node: 20.x, os: windows-2022, vs-version: '17', configure-args: vs2022 } - { node: 22.x, os: windows-2022, vs-version: '17', configure-args: vs2022 } - { node: 24.x, os: windows-2022, vs-version: '17', configure-args: vs2022 } - # TEMPORARY: Node 26.4.0 (latest release) fails to build with VS2026's - # Clang 22, which the libffi fix in nodejs/node#64222 addresses. That - # fix is on main but not yet in a v26.x release, so compile a main - # nightly that contains it to verify VS2026 works. Revert to a plain - # 26.x release once the fix lands in one. - - { node: 26.x, os: windows-latest, vs-version: '18', configure-args: vs2026, test-node-version: v27.0.0-nightly20260702b2e83150cb } + - { node: 26.x, os: windows-latest, vs-version: '18', configure-args: vs2026 } test-to-run: ["works in a simple case","works with a Nan addon","works with a N-API addon","passes through env vars and runs the pre-compile hook","works with code caching support","works with snapshot support (compressBlobs = "] runs-on: ${{ matrix.target.os }} steps: @@ -83,6 +78,3 @@ jobs: env: BOXEDNODE_MAKE_ARGS: "debug" BOXEDNODE_CONFIGURE_ARGS: ${{ matrix.target.configure-args }} - # When set, boxednode compiles this exact version from source instead - # of the host Node.js version. Empty for release legs. - TEST_NODE_VERSION: ${{ matrix.target.test-node-version }} diff --git a/.github/workflows/nodejs.yml.in b/.github/workflows/nodejs.yml.in index ff58035..44b4912 100644 --- a/.github/workflows/nodejs.yml.in +++ b/.github/workflows/nodejs.yml.in @@ -41,12 +41,7 @@ jobs: - { node: 20.x, os: windows-2022, vs-version: '17', configure-args: vs2022 } - { node: 22.x, os: windows-2022, vs-version: '17', configure-args: vs2022 } - { node: 24.x, os: windows-2022, vs-version: '17', configure-args: vs2022 } - # TEMPORARY: Node 26.4.0 (latest release) fails to build with VS2026's - # Clang 22, which the libffi fix in nodejs/node#64222 addresses. That - # fix is on main but not yet in a v26.x release, so compile a main - # nightly that contains it to verify VS2026 works. Revert to a plain - # 26.x release once the fix lands in one. - - { node: 26.x, os: windows-latest, vs-version: '18', configure-args: vs2026, test-node-version: v27.0.0-nightly20260702b2e83150cb } + - { node: 26.x, os: windows-latest, vs-version: '18', configure-args: vs2026 } test-to-run: <> runs-on: ${{ matrix.target.os }} steps: @@ -79,6 +74,3 @@ jobs: env: BOXEDNODE_MAKE_ARGS: "debug" BOXEDNODE_CONFIGURE_ARGS: ${{ matrix.target.configure-args }} - # When set, boxednode compiles this exact version from source instead - # of the host Node.js version. Empty for release legs. - TEST_NODE_VERSION: ${{ matrix.target.test-node-version }} diff --git a/package.json b/package.json index 3e9cb70..050004c 100644 --- a/package.json +++ b/package.json @@ -69,5 +69,10 @@ "rimraf": "^6.1.0", "tar": "^7.5.19", "yargs": "^16.0.3" + }, + "overrides": { + "node-gyp": { + "undici": "^7.16.0" + } } }