Skip to content

Commit 31c2b5f

Browse files
committed
CI: Don't upgrade npm twice on Windows
1 parent d894c87 commit 31c2b5f

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

script/vsts/platforms/templates/bootstrap.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ steps:
22
- pwsh: |
33
# OS specific env variables
44
if ($env:AGENT_OS -eq "Windows_NT") {
5-
$env:NPM_BIN_PATH="C:/hostedtoolcache/windows/node/12.4.0/x64/npm.cmd"
5+
$env:NPM_BIN_PATH="C:/npm/prefix/npm.cmd"
66
$env:npm_config_build_from_source=true
77
}
88
if ($env:AGENT_OS -eq "Darwin") {

script/vsts/platforms/templates/preparation.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,6 @@ steps:
4242
versionSpec: '3.8'
4343
condition: eq(variables['Agent.OS'], 'Windows_NT')
4444

45-
- script: |
46-
ECHO Installing npm-windows-upgrade
47-
npm install --global --production npm-windows-upgrade
48-
displayName: Install npm-windows-upgrade
49-
condition: eq(variables['Agent.OS'], 'Windows_NT')
50-
51-
- script: |
52-
ECHO Upgrading npm
53-
npm-windows-upgrade --no-spinner --no-prompt --npm-version 6.14.8
54-
displayName: Install npm 6.14.8
55-
condition: eq(variables['Agent.OS'], 'Windows_NT')
56-
5745
- script: |
5846
cd script\vsts
5947
npm install

0 commit comments

Comments
 (0)