Skip to content

Commit f847da5

Browse files
cclausscclauss
committed
npm v12 removes command-line options
1 parent 3f81949 commit f847da5

3 files changed

Lines changed: 28 additions & 24 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ jobs:
124124
with:
125125
python-version: ${{ matrix.python }}
126126
allow-prereleases: true
127+
- run: py --list-paths || true # Show all Python paths on Windows
127128
- uses: seanmiddleditch/gha-setup-ninja@v6
128129
- name: Install wasi-sdk (Windows)
129130
shell: pwsh
@@ -163,15 +164,19 @@ jobs:
163164
echo 'GYP_MSVS_OVERRIDE_PATH=C:\\Dummy' >> $Env:GITHUB_ENV
164165
- name: Run Python Tests
165166
run: python -m pytest
166-
- name: Run Tests (macOS or Linux)
167+
- name: Run Tests (Linux or macOS)
167168
if: runner.os != 'Windows'
168-
shell: bash
169-
run: npm test --python="${pythonLocation}/python"
170169
env:
171170
FULL_TEST: ${{ (matrix.node == '24.x' && matrix.python == '3.14') && '1' || '0' }}
171+
NODE_GYP_FORCE_PYTHON: "${{ env.pythonLocation }}/python"
172+
run: npm test
172173
- name: Run Tests (Windows)
173174
if: runner.os == 'Windows'
174175
shell: bash # Building wasm on Windows requires using make generator, it only works in bash
175-
run: npm run test --python="${pythonLocation}\\python.exe"
176176
env:
177177
FULL_TEST: ${{ (matrix.node == '24.x' && matrix.python == '3.14') && '1' || '0' }}
178+
NODE_GYP_FORCE_PYTHON: "${{ env.pythonLocation }}\\python.exe"
179+
run: |
180+
echo "NODE_GYP_FORCE_PYTHON=${NODE_GYP_FORCE_PYTHON}"
181+
npm run test
182+

‎.github/workflows/visual-studio.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ jobs:
3333
python-version: "3.x"
3434
- name: Install Dependencies
3535
run: npm install
36+
# - run: echo "pythonLocation=${pythonLocation}"
37+
- run: echo "env:pythonLocation=${env:pythonLocation}"
38+
# - run: env
3639
- name: Run Node tests
37-
shell: pwsh
38-
run: npm run test --python="${env:pythonLocation}\\python.exe" --msvs-version="${{ matrix.msvs-version }}"
40+
shell: bash # Building wasm on Windows requires using make generator, it only works in bash
41+
run: npm run test

‎gyp/.github/workflows/node-gyp.yml‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,35 @@ jobs:
1111
matrix:
1212
os: [macos-latest, ubuntu-latest, windows-latest]
1313
python-version: ["3.10", "3.12", "3.14"]
14-
exclude:
15-
# Windows on Python 3.14 is blocked by nodejs/node#59983
14+
#exclude:
15+
# # Windows on Python 3.14 is blocked by nodejs/node#59983
16+
# - os: windows-latest
17+
# python-version: "3.14"
18+
include:
1619
- os: windows-latest
1720
python-version: "3.14"
18-
include:
19-
- os: windows-latest # Windows on Python 3.13 instead of 3.14
20-
python-version: "3.13"
2121
- os: macos-15-intel # macOS on Intel
2222
python-version: "3.14"
2323
- os: ubuntu-24.04-arm # Ubuntu on ARM
2424
python-version: "3.14"
2525
- os: windows-11-arm # Windows on ARM
26-
python-version: "3.13" # Windows on Python 3.13 instead of 3.14
26+
python-version: "3.14"
2727
runs-on: ${{ matrix.os }}
2828
steps:
2929
- name: Clone gyp-next
30-
uses: actions/checkout@v5
30+
uses: actions/checkout@v6
3131
with:
3232
path: gyp-next
3333
- name: Clone nodejs/node-gyp
34-
uses: actions/checkout@v5
34+
uses: actions/checkout@v6
3535
with:
3636
repository: nodejs/node-gyp
3737
path: node-gyp
3838
- uses: actions/setup-node@v6
3939
with:
4040
node-version: "lts/*"
41-
- uses: actions/setup-python@v6
41+
- name: Use Python ${{ matrix.python-version }}
42+
uses: actions/setup-python@v6
4243
with:
4344
python-version: ${{ matrix.python-version }}
4445
allow-prereleases: true
@@ -57,14 +58,9 @@ jobs:
5758
run: |
5859
rm -rf node-gyp/gyp
5960
cp -r gyp-next node-gyp/gyp
60-
- name: Run tests (macOS or Linux)
61-
if: runner.os != 'Windows'
62-
run: |
63-
cd node-gyp
64-
npm test --python="${pythonLocation}/python"
65-
- name: Run tests (Windows)
66-
if: runner.os == 'Windows'
67-
shell: pwsh
61+
- run: echo "env:pythonLocation=${env:pythonLocation}"
62+
# - run: env
63+
- name: Run tests
6864
run: |
6965
cd node-gyp
70-
npm run test --python="${env:pythonLocation}\\python.exe"
66+
npm test

0 commit comments

Comments
 (0)