From 12b195f9d507bfc0aa4d0199972ae32d096ef1ad Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sun, 22 Sep 2019 15:32:52 -0400 Subject: [PATCH] ci: update windows image to MSVC 2019 --- ci/azure/pipelines.yml | 2 +- ci/azure/windows_script.bat | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/azure/pipelines.yml b/ci/azure/pipelines.yml index 8e6fcde63..bcc2f1194 100644 --- a/ci/azure/pipelines.yml +++ b/ci/azure/pipelines.yml @@ -27,7 +27,7 @@ jobs: displayName: 'Build and test' - job: BuildWindows pool: - vmImage: 'vs2017-win2016' + vmImage: 'windows-2019' timeoutInMinutes: 360 diff --git a/ci/azure/windows_script.bat b/ci/azure/windows_script.bat index dcd78981e..ee6016a34 100644 --- a/ci/azure/windows_script.bat +++ b/ci/azure/windows_script.bat @@ -13,11 +13,11 @@ SET "ZIGBUILDDIR=%SRCROOT%\build" SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\Release" SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang-9.0.0-win64-msvc-release" -call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 mkdir %ZIGBUILDDIR% cd %ZIGBUILDDIR% -cmake.exe .. -Thost=x64 -G"Visual Studio 15 2017 Win64" "-DCMAKE_INSTALL_PREFIX=%ZIGINSTALLDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release || exit /b +cmake.exe .. -Thost=x64 -G"Visual Studio 16 2019" -A x64 "-DCMAKE_INSTALL_PREFIX=%ZIGINSTALLDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release || exit /b msbuild /p:Configuration=Release INSTALL.vcxproj || exit /b "%ZIGINSTALLDIR%\bin\zig.exe" build test || exit /b