diff options
author | Robo <hop2deep@gmail.com> | 2022-03-10 18:51:37 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-10 18:51:37 +0300 |
commit | 32d40cf44e893e87ac33ac4f08de1e5f7fe077fc (patch) | |
tree | 2b248b86f0270ceb21a5b17118f70e9e00f02dfe /.github | |
parent | 9109c6531f923991f5054c420e1456297ccb59a2 (diff) |
chore: update to electron 17 (#143223)
* chore: bump electron@17.0.0
* Revert "chore: revert to electron@13 (#143851)"
This reverts commit df645f14506142d6b20be6f6bda6bc40286ff739.
* chore: bump electron@17.1.0
* Revert "ci: fix build with latest node-gyp"
This reverts commit c3e948aa30f54b0ad20f1a99627949cda4ad0c9f.
* chore: revert ci changes for node v16
* chore: update yarn.lock
* chore: bump electron@17.1.1
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/ci.yml | 33 | ||||
-rw-r--r-- | .github/workflows/rich-navigation.yml | 15 |
2 files changed, 13 insertions, 35 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e837bb4b72..12973f26771 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-node@v2 with: - node-version: 14 + node-version: 16 - uses: actions/setup-python@v2 with: @@ -57,18 +57,7 @@ jobs: env: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 ELECTRON_SKIP_BINARY_DOWNLOAD: 1 - 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) - # Electron <= 13 does not ship with correct config.gypi headers, - # remove this once we update to newer versions. - # Refs https://github.com/nodejs/node-gyp/pull/2497 - $env:npm_config_force_process_config="true" - yarn --frozen-lockfile --network-timeout 180000 + run: yarn --frozen-lockfile --network-timeout 180000 - name: Create node_modules archive if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} run: | @@ -124,7 +113,7 @@ jobs: - uses: actions/setup-node@v2 with: - node-version: 14 + node-version: 16 - name: Compute node modules cache key id: nodeModulesCacheKey @@ -134,8 +123,8 @@ jobs: uses: actions/cache@v2 with: path: "**/node_modules" - key: ${{ runner.os }}-cacheNodeModules20-${{ steps.nodeModulesCacheKey.outputs.value }} - restore-keys: ${{ runner.os }}-cacheNodeModules20- + key: ${{ runner.os }}-cacheNodeModules21-${{ steps.nodeModulesCacheKey.outputs.value }} + restore-keys: ${{ runner.os }}-cacheNodeModules21- - name: Get yarn cache directory path id: yarnCacheDirPath if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} @@ -196,7 +185,7 @@ jobs: - uses: actions/setup-node@v2 with: - node-version: 14 + node-version: 16 - name: Compute node modules cache key id: nodeModulesCacheKey @@ -206,8 +195,8 @@ jobs: uses: actions/cache@v2 with: path: "**/node_modules" - key: ${{ runner.os }}-cacheNodeModules20-${{ steps.nodeModulesCacheKey.outputs.value }} - restore-keys: ${{ runner.os }}-cacheNodeModules20- + key: ${{ runner.os }}-cacheNodeModules21-${{ steps.nodeModulesCacheKey.outputs.value }} + restore-keys: ${{ runner.os }}-cacheNodeModules21- - name: Get yarn cache directory path id: yarnCacheDirPath if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} @@ -270,7 +259,7 @@ jobs: - uses: actions/setup-node@v2 with: - node-version: 14 + node-version: 16 - name: Compute node modules cache key id: nodeModulesCacheKey @@ -280,8 +269,8 @@ jobs: uses: actions/cache@v2 with: path: "**/node_modules" - key: ${{ runner.os }}-cacheNodeModules20-${{ steps.nodeModulesCacheKey.outputs.value }} - restore-keys: ${{ runner.os }}-cacheNodeModules20- + key: ${{ runner.os }}-cacheNodeModules21-${{ steps.nodeModulesCacheKey.outputs.value }} + restore-keys: ${{ runner.os }}-cacheNodeModules21- - name: Get yarn cache directory path id: yarnCacheDirPath if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} diff --git a/.github/workflows/rich-navigation.yml b/.github/workflows/rich-navigation.yml index add178c1498..a154e88f61f 100644 --- a/.github/workflows/rich-navigation.yml +++ b/.github/workflows/rich-navigation.yml @@ -24,22 +24,11 @@ jobs: - uses: actions/setup-node@v2 with: - node-version: 14 + node-version: 16 - name: Install dependencies if: steps.caching-stage.outputs.cache-hit != 'true' - 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) - # Electron <= 13 does not ship with correct config.gypi headers, - # remove this once we update to newer versions. - # Refs https://github.com/nodejs/node-gyp/pull/2497 - $env:npm_config_force_process_config="true" - yarn --frozen-lockfile + run: yarn --frozen-lockfile env: CHILD_CONCURRENCY: 1 |