Skip to content

Commit

Permalink
Merge pull request atom#20494 from atom/upgrade-windows-azuredevops-i…
Browse files Browse the repository at this point in the history
…mage-version-take-2

Bump Azure Devops Windows images to version vs2017-win2016
  • Loading branch information
lkashef authored Mar 11, 2020
2 parents 90993ee + 667c73a commit 97565c6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion script/vsts/nightly-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

- job: Release
pool:
vmImage: vs2015-win2012r2 # needed for Python 2.7 and gyp
vmImage: vs2017-win2016

dependsOn:
- GetReleaseVersion
Expand Down
12 changes: 10 additions & 2 deletions script/vsts/platforms/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
buildArch: x86

pool:
vmImage: vs2015-win2012r2 # needed for python 2.7 and gyp
vmImage: vs2017-win2016

variables:
AppName: $[ dependencies.GetReleaseVersion.outputs['Version.AppName'] ]
Expand All @@ -20,6 +20,10 @@ jobs:
IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]

steps:
- task: UsePythonVersion@0
inputs:
versionSpec: '2.7'

- task: NodeTool@0
inputs:
versionSpec: 10.2.1
Expand All @@ -35,6 +39,10 @@ jobs:
npm-windows-upgrade --no-spinner --no-prompt --npm-version 6.2.0
displayName: Install npm 6.2.0
- script: |
npm install --global --production [email protected]
displayName: Install windows build tools
- script: |
cd script\vsts
npm install
Expand Down Expand Up @@ -62,7 +70,7 @@ jobs:
BUILD_ARCH: $(buildArch)
CI: true
CI_PROVIDER: VSTS
NPM_BIN_PATH: "D:\\a\\_tool\\node\\10.2.1\\x64\\npm.cmd"
NPM_BIN_PATH: "C:\\hostedtoolcache\\windows\\node\\10.2.1\\x64\\npm.cmd"
displayName: Bootstrap build environment
condition: ne(variables['CacheRestored'], 'true')
Expand Down
2 changes: 1 addition & 1 deletion script/vsts/release-branch-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- job: UploadArtifacts
pool:
vmImage: vs2015-win2012r2 # needed for python 2.7 and gyp
vmImage: vs2017-win2016

dependsOn:
- GetReleaseVersion
Expand Down

0 comments on commit 97565c6

Please sign in to comment.