authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-09-22 15:32:52-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-09-22 15:32:52-04:00
log12b195f9d507bfc0aa4d0199972ae32d096ef1ad
tree4cf0061ef4da219b1f6637084dbe5a0ca272a7b2
parentcf4cc9b148e069b46a197d0423e4d25654aea26c
signaturelock-open Commit is signed but in an unrecognized format.

ci: update windows image to MSVC 2019

2 files changed, 3 insertions(+), 3 deletions(-)

ci/azure/pipelines.yml+1-1
...@@ -27,7 +27,7 @@ jobs:...@@ -27,7 +27,7 @@ jobs:
27 displayName: 'Build and test'27 displayName: 'Build and test'
28- job: BuildWindows28- job: BuildWindows
29 pool:29 pool:
30 vmImage: 'vs2017-win2016'30 vmImage: 'windows-2019'
3131
32 timeoutInMinutes: 36032 timeoutInMinutes: 360
3333
ci/azure/windows_script.bat+2-2
...@@ -13,11 +13,11 @@ SET "ZIGBUILDDIR=%SRCROOT%\build"...@@ -13,11 +13,11 @@ SET "ZIGBUILDDIR=%SRCROOT%\build"
13SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\Release"13SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\Release"
14SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang-9.0.0-win64-msvc-release"14SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang-9.0.0-win64-msvc-release"
1515
16call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x6416call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
1717
18mkdir %ZIGBUILDDIR%18mkdir %ZIGBUILDDIR%
19cd %ZIGBUILDDIR%19cd %ZIGBUILDDIR%
20cmake.exe .. -Thost=x64 -G"Visual Studio 15 2017 Win64" "-DCMAKE_INSTALL_PREFIX=%ZIGINSTALLDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release || exit /b20cmake.exe .. -Thost=x64 -G"Visual Studio 16 2019" -A x64 "-DCMAKE_INSTALL_PREFIX=%ZIGINSTALLDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release || exit /b
21msbuild /p:Configuration=Release INSTALL.vcxproj || exit /b21msbuild /p:Configuration=Release INSTALL.vcxproj || exit /b
2222
23"%ZIGINSTALLDIR%\bin\zig.exe" build test || exit /b23"%ZIGINSTALLDIR%\bin\zig.exe" build test || exit /b