diff options
| author | Robo <hop2deep@gmail.com> | 2022-02-28 14:20:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-28 14:20:12 +0300 |
| commit | 5783ee998dd098f03e4380b6549d41eb6f80ee37 (patch) | |
| tree | 32d85553c44fae317f84301814ae737ddd3b43bc /.github | |
| parent | d13e7e7d6dcd0352860227b5c647e5a9ddd82283 (diff) | |
ci: update node-gyp for VS 2022 support (#144056)
* ci: update node-gyp for VS 2022 support
* chore: update cache
* chore: update comments
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci.yml | 11 | ||||
| -rw-r--r-- | .github/workflows/rich-navigation.yml | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 223f934d347..8f191223bee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ on: jobs: windows: name: Windows - runs-on: windows-2019 + runs-on: windows-2022 timeout-minutes: 60 env: CHILD_CONCURRENCY: "1" @@ -57,7 +57,14 @@ jobs: env: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 ELECTRON_SKIP_BINARY_DOWNLOAD: 1 - run: yarn --frozen-lockfile --network-timeout 180000 + 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 > 17.4.x or > 16.14.0, + # 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) + yarn --frozen-lockfile --network-timeout 180000 - name: Create node_modules archive if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} run: | diff --git a/.github/workflows/rich-navigation.yml b/.github/workflows/rich-navigation.yml index 2afe38c5e71..bd9b7d1b560 100644 --- a/.github/workflows/rich-navigation.yml +++ b/.github/workflows/rich-navigation.yml @@ -10,7 +10,7 @@ on: jobs: richnav: - runs-on: windows-latest + runs-on: windows-2022 steps: - uses: actions/checkout@v2 @@ -28,7 +28,14 @@ jobs: - name: Install dependencies if: steps.caching-stage.outputs.cache-hit != 'true' - run: yarn --frozen-lockfile + 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 > 17.4.x or > 16.14.0, + # 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) + yarn --frozen-lockfile env: CHILD_CONCURRENCY: 1 |