Commit d909524e by Patrick Steinhardt

azure: upgrade to newer Windows VM images

This is a subset of commit 95f329b4 (azure: upgrade to newer hosted VM
images, 2020-03-10), upgrading all of our Windows jobs to use
'vs2017-win2016' machines and macOS to 'macos-10.14'. This is intended
to keep our continuous integration builds from failing in the future, as
these images will get deprecated on March 31st. As this is in
preparation of a stable release, we do not want to upgrade any of the
other machines like is done in the mentioned commit but keep the impact
minimal.

fixup! azure: upgrade to newer Windows VM images
parent 4dc93239
......@@ -61,7 +61,7 @@ jobs:
- job: macos
displayName: 'macOS'
pool:
vmImage: 'macOS 10.13'
vmImage: 'macOS-10.14'
steps:
- bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh'
displayName: Setup
......@@ -76,25 +76,28 @@ jobs:
- job: windows_vs_amd64
displayName: 'Windows (amd64; Visual Studio)'
pool: Hosted
pool:
vmImage: 'vs2017-win2016'
steps:
- template: azure-pipelines/powershell.yml
parameters:
environmentVariables:
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013 Win64" -DDEPRECATE_HARD=ON
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 15 2017" -A x64 -DDEPRECATE_HARD=ON
- job: windows_vs_x86
displayName: 'Windows (x86; Visual Studio)'
pool: Hosted
pool:
vmImage: 'vs2017-win2016'
steps:
- template: azure-pipelines/powershell.yml
parameters:
environmentVariables:
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013" -DDEPRECATE_HARD=ON
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 15 2017" -A Win32 -DDEPRECATE_HARD=ON
- job: windows_mingw_amd64
displayName: 'Windows (amd64; MinGW)'
pool: Hosted
pool:
vmImage: 'vs2017-win2016'
steps:
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
displayName: Setup
......@@ -109,7 +112,8 @@ jobs:
- job: windows_mingw_x86
displayName: 'Windows (x86; MinGW)'
pool: Hosted
pool:
vmImage: 'vs2017-win2016'
steps:
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
displayName: Setup
......
......@@ -61,7 +61,7 @@ jobs:
- job: macos
displayName: 'macOS'
pool:
vmImage: 'macOS 10.13'
vmImage: 'macOS-10.14'
steps:
- bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh'
displayName: Setup
......@@ -77,27 +77,30 @@ jobs:
- job: windows_vs_amd64
displayName: 'Windows (amd64; Visual Studio)'
pool: Hosted
pool:
vmImage: 'vs2017-win2016'
steps:
- template: powershell.yml
parameters:
environmentVariables:
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013 Win64" -DDEPRECATE_HARD=ON
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 15 2017" -A x64 -DDEPRECATE_HARD=ON
RUN_INVASIVE_TESTS: true
- job: windows_vs_x86
displayName: 'Windows (x86; Visual Studio)'
pool: Hosted
pool:
vmImage: 'vs2017-win2016'
steps:
- template: powershell.yml
parameters:
environmentVariables:
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013" -DDEPRECATE_HARD=ON
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 15 2017" -A Win32 -DDEPRECATE_HARD=ON
RUN_INVASIVE_TESTS: true
- job: windows_mingw_amd64
displayName: 'Windows (amd64; MinGW)'
pool: Hosted
pool:
vmImage: 'vs2017-win2016'
steps:
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
displayName: Setup
......@@ -113,7 +116,8 @@ jobs:
- job: windows_mingw_x86
displayName: 'Windows (x86; MinGW)'
pool: Hosted
pool:
vmImage: 'vs2017-win2016'
steps:
- powershell: . '$(Build.SourcesDirectory)\ci\setup-mingw.ps1'
displayName: Setup
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment