Skip to content

Commit

Permalink
Merge branch 'main' into alexd/warm-horse
Browse files Browse the repository at this point in the history
  • Loading branch information
alexdima authored Jan 22, 2024
2 parents b0d4a75 + 2901d97 commit 1f05fce
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,8 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: 14
- run: |
# update node-gyp to latest for support in detecting VS 2022 toolchain
npm install -g node-gyp@latest
# Resolve to node-gyp.js
# Remove this once node-version >= 16.x,
# which ships with npm > 8.4.0 that has support for VS 2022 toolchain.
$env:npm_config_node_gyp=$(Join-Path $(Get-Command node-gyp.cmd).Path "..\node_modules\node-gyp\bin\node-gyp.js" -Resolve)
npm ci
node-version: 16
- run: npm ci
- run: npm test

linux:
Expand All @@ -28,7 +21,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: 14
node-version: 16
- run: npm ci
- run: npm test

Expand All @@ -39,6 +32,8 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: 14
node-version: 16
# https://github.com/nodejs/node-gyp/issues/2869
- run: python3 -m pip install setuptools
- run: npm ci
- run: npm test

0 comments on commit 1f05fce

Please sign in to comment.