Skip to content

Commit f5ffa62

Browse files
committed
CI: Don't upgrade npm twice on Windows
We already install the npm version we want in previous steps #140
1 parent 56d5fa1 commit f5ffa62

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.16.3/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
@@ -34,18 +34,6 @@ steps:
3434
versionSpec: '3.8'
3535
condition: eq(variables['Agent.OS'], 'Windows_NT')
3636

37-
- script: |
38-
ECHO Installing npm-windows-upgrade
39-
npm install --global --production npm-windows-upgrade
40-
displayName: Install npm-windows-upgrade
41-
condition: eq(variables['Agent.OS'], 'Windows_NT')
42-
43-
- script: |
44-
ECHO Upgrading npm
45-
npm-windows-upgrade --no-spinner --no-prompt --npm-version 6.9.0
46-
displayName: Install npm 6.9.0
47-
condition: eq(variables['Agent.OS'], 'Windows_NT')
48-
4937
- script: |
5038
npm install --global --production [email protected]
5139
displayName: Install windows build tools

0 commit comments

Comments
 (0)