diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index 605d73183d4..3fd6daf0048 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -31,7 +31,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 18 + node-version-file: .nvmrc - name: Compute node modules cache key id: nodeModulesCacheKey @@ -83,7 +83,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 18 + node-version-file: .nvmrc - name: Compute node modules cache key id: nodeModulesCacheKey @@ -145,7 +145,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 18 + node-version-file: .nvmrc - name: Compute node modules cache key id: nodeModulesCacheKey diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92f596fb9f8..a598efa9f37 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 18 + node-version-file: .nvmrc - uses: actions/setup-python@v4 with: @@ -115,7 +115,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 18 + node-version-file: .nvmrc - name: Compute node modules cache key id: nodeModulesCacheKey @@ -186,7 +186,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 18 + node-version-file: .nvmrc - name: Compute node modules cache key id: nodeModulesCacheKey @@ -258,7 +258,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 18 + node-version-file: .nvmrc - name: Compute node modules cache key id: nodeModulesCacheKey diff --git a/.github/workflows/monaco-editor.yml b/.github/workflows/monaco-editor.yml index 2501e08db9f..eb263b3340c 100644 --- a/.github/workflows/monaco-editor.yml +++ b/.github/workflows/monaco-editor.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 18.15 + node-version-file: .nvmrc - name: Compute node modules cache key id: nodeModulesCacheKey @@ -53,7 +53,9 @@ jobs: env: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 ELECTRON_SKIP_BINARY_DOWNLOAD: 1 - run: yarn --frozen-lockfile --network-timeout 180000 + run: | + npm i -g node-gyp@9.4.0 + yarn --frozen-lockfile --network-timeout 180000 - name: Download Playwright run: yarn playwright-install diff --git a/.github/workflows/rich-navigation.yml.off b/.github/workflows/rich-navigation.yml.off index a05130cbce4..73d073f4d7b 100644 --- a/.github/workflows/rich-navigation.yml.off +++ b/.github/workflows/rich-navigation.yml.off @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 18 + node-version-file: .nvmrc - name: Install dependencies if: steps.caching-stage.outputs.cache-hit != 'true' diff --git a/.nvmrc b/.nvmrc index 0f9eb824458..2f3e481d471 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.15 \ No newline at end of file +18.18 \ No newline at end of file diff --git a/build/azure-pipelines/alpine/cli-build-alpine.yml b/build/azure-pipelines/alpine/cli-build-alpine.yml index 5578e1b4824..d10fbe898e4 100644 --- a/build/azure-pipelines/alpine/cli-build-alpine.yml +++ b/build/azure-pipelines/alpine/cli-build-alpine.yml @@ -11,7 +11,8 @@ parameters: steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: # Install yarn as the ARM64 build agent is using vanilla Ubuntu diff --git a/build/azure-pipelines/alpine/product-build-alpine.yml b/build/azure-pipelines/alpine/product-build-alpine.yml index 90cf6ac2c35..4e318644d08 100644 --- a/build/azure-pipelines/alpine/product-build-alpine.yml +++ b/build/azure-pipelines/alpine/product-build-alpine.yml @@ -1,7 +1,8 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - template: ../distro/download-distro.yml diff --git a/build/azure-pipelines/darwin/cli-build-darwin.yml b/build/azure-pipelines/darwin/cli-build-darwin.yml index e73d0f6cf2f..0bf063276ca 100644 --- a/build/azure-pipelines/darwin/cli-build-darwin.yml +++ b/build/azure-pipelines/darwin/cli-build-darwin.yml @@ -14,7 +14,8 @@ parameters: steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - template: ../cli/cli-apply-patches.yml diff --git a/build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml b/build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml index 407ba2d68a2..87d631ddc47 100644 --- a/build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml +++ b/build/azure-pipelines/darwin/product-build-darwin-cli-sign.yml @@ -7,7 +7,8 @@ parameters: steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - script: node build/setup-npm-registry.js $NPM_REGISTRY build condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) diff --git a/build/azure-pipelines/darwin/product-build-darwin-sign.yml b/build/azure-pipelines/darwin/product-build-darwin-sign.yml index 99ba343e84c..5cf10f9f7e4 100644 --- a/build/azure-pipelines/darwin/product-build-darwin-sign.yml +++ b/build/azure-pipelines/darwin/product-build-darwin-sign.yml @@ -1,7 +1,8 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - task: UseDotNet@2 inputs: diff --git a/build/azure-pipelines/darwin/product-build-darwin-universal.yml b/build/azure-pipelines/darwin/product-build-darwin-universal.yml index 9f79d63c508..b59866f4664 100644 --- a/build/azure-pipelines/darwin/product-build-darwin-universal.yml +++ b/build/azure-pipelines/darwin/product-build-darwin-universal.yml @@ -1,7 +1,8 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - template: ../distro/download-distro.yml diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml index f39d7da935c..35b207cb7f5 100644 --- a/build/azure-pipelines/darwin/product-build-darwin.yml +++ b/build/azure-pipelines/darwin/product-build-darwin.yml @@ -18,7 +18,8 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - template: ../distro/download-distro.yml @@ -77,7 +78,7 @@ steps: - script: | set -e export npm_config_arch=$(VSCODE_ARCH) - npm i -g node-gyp + npm i -g node-gyp@9.4.0 for i in {1..5}; do # try 5 times yarn --frozen-lockfile --check-files && break diff --git a/build/azure-pipelines/distro-build.yml b/build/azure-pipelines/distro-build.yml index 2d2192b833b..552aced7685 100644 --- a/build/azure-pipelines/distro-build.yml +++ b/build/azure-pipelines/distro-build.yml @@ -9,5 +9,6 @@ pr: none steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - template: ./distro/download-distro.yml diff --git a/build/azure-pipelines/linux/cli-build-linux.yml b/build/azure-pipelines/linux/cli-build-linux.yml index e3be6d04654..4a0602655f0 100644 --- a/build/azure-pipelines/linux/cli-build-linux.yml +++ b/build/azure-pipelines/linux/cli-build-linux.yml @@ -17,7 +17,8 @@ parameters: steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - template: ../cli/cli-apply-patches.yml diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml index 25cd7e4b676..2f43515414f 100644 --- a/build/azure-pipelines/linux/product-build-linux.yml +++ b/build/azure-pipelines/linux/product-build-linux.yml @@ -20,7 +20,8 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - template: ../distro/download-distro.yml diff --git a/build/azure-pipelines/linux/snap-build-linux.yml b/build/azure-pipelines/linux/snap-build-linux.yml index d56a5a81b45..c74783da146 100644 --- a/build/azure-pipelines/linux/snap-build-linux.yml +++ b/build/azure-pipelines/linux/snap-build-linux.yml @@ -1,7 +1,8 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - task: DownloadPipelineArtifact@0 displayName: "Download Pipeline Artifact" diff --git a/build/azure-pipelines/oss/product-build-pr-cache-linux.yml b/build/azure-pipelines/oss/product-build-pr-cache-linux.yml index cf6cbc259fa..f572c6fe688 100644 --- a/build/azure-pipelines/oss/product-build-pr-cache-linux.yml +++ b/build/azure-pipelines/oss/product-build-pr-cache-linux.yml @@ -5,7 +5,8 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - script: node build/setup-npm-registry.js $NPM_REGISTRY condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) diff --git a/build/azure-pipelines/oss/product-build-pr-cache-win32.yml b/build/azure-pipelines/oss/product-build-pr-cache-win32.yml index 4c76111275c..e4d70f0c7d7 100644 --- a/build/azure-pipelines/oss/product-build-pr-cache-win32.yml +++ b/build/azure-pipelines/oss/product-build-pr-cache-win32.yml @@ -5,7 +5,8 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - powershell: node build/setup-npm-registry.js $env:NPM_REGISTRY condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml index 1c18f54cbc3..5b5be806934 100644 --- a/build/azure-pipelines/product-compile.yml +++ b/build/azure-pipelines/product-compile.yml @@ -5,7 +5,8 @@ parameters: steps: - task: NodeTool@0 inputs: - versionSpec: "18.15.x" + versionSource: fromFile + versionFilePath: .nvmrc - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - template: ./distro/download-distro.yml @@ -58,6 +59,8 @@ steps: - script: | set -e + npm i -g node-gyp@9.4.0 + for i in {1..5}; do # try 5 times yarn --frozen-lockfile --check-files && break if [ $i -eq 3 ]; then diff --git a/build/azure-pipelines/product-publish.yml b/build/azure-pipelines/product-publish.yml index 49a38913c2c..aa4736874fc 100644 --- a/build/azure-pipelines/product-publish.yml +++ b/build/azure-pipelines/product-publish.yml @@ -1,7 +1,8 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - task: AzureKeyVault@1 displayName: "Azure Key Vault: Get Secrets" diff --git a/build/azure-pipelines/product-release.yml b/build/azure-pipelines/product-release.yml index d10855423bd..93f5fe9568a 100644 --- a/build/azure-pipelines/product-release.yml +++ b/build/azure-pipelines/product-release.yml @@ -5,7 +5,8 @@ parameters: steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - task: AzureCLI@2 inputs: diff --git a/build/azure-pipelines/publish-types/publish-types.yml b/build/azure-pipelines/publish-types/publish-types.yml index db4768e75c9..6e2e6bedac1 100644 --- a/build/azure-pipelines/publish-types/publish-types.yml +++ b/build/azure-pipelines/publish-types/publish-types.yml @@ -12,7 +12,8 @@ pool: steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - bash: | TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`) diff --git a/build/azure-pipelines/sdl-scan.yml b/build/azure-pipelines/sdl-scan.yml index 1da84032e66..cdc36fa7c56 100644 --- a/build/azure-pipelines/sdl-scan.yml +++ b/build/azure-pipelines/sdl-scan.yml @@ -52,7 +52,8 @@ stages: outputFormat: "pre" - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - template: ./distro/download-distro.yml @@ -179,7 +180,8 @@ stages: toolMajorVersion: "V2" - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - template: ./distro/download-distro.yml diff --git a/build/azure-pipelines/web/product-build-web.yml b/build/azure-pipelines/web/product-build-web.yml index 461e3b148fd..ecdfe91ed0b 100644 --- a/build/azure-pipelines/web/product-build-web.yml +++ b/build/azure-pipelines/web/product-build-web.yml @@ -1,7 +1,8 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - template: ../distro/download-distro.yml diff --git a/build/azure-pipelines/win32/cli-build-win32.yml b/build/azure-pipelines/win32/cli-build-win32.yml index 0a29826918d..8cc72d8938b 100644 --- a/build/azure-pipelines/win32/cli-build-win32.yml +++ b/build/azure-pipelines/win32/cli-build-win32.yml @@ -17,7 +17,8 @@ parameters: steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - template: ../cli/cli-apply-patches.yml diff --git a/build/azure-pipelines/win32/product-build-win32-cli-sign.yml b/build/azure-pipelines/win32/product-build-win32-cli-sign.yml index 48f3114d390..a1c5562c64c 100644 --- a/build/azure-pipelines/win32/product-build-win32-cli-sign.yml +++ b/build/azure-pipelines/win32/product-build-win32-cli-sign.yml @@ -10,7 +10,8 @@ steps: - task: NodeTool@0 displayName: "Use Node.js" inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - powershell: node build/setup-npm-registry.js $env:NPM_REGISTRY build condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml index 7b80beb01a3..7391638cf68 100644 --- a/build/azure-pipelines/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -20,7 +20,8 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "18.15" + versionSource: fromFile + versionFilePath: .nvmrc - task: UsePythonVersion@0 inputs: