Skip to content

Commit 0ee2d15

Browse files
authored
Merge pull request #3577 from martin-frbg/azure_win2022
Update Windows jobs in Azure CI to use Windows2022
2 parents 694f6c5 + a0e86ad commit 0ee2d15

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

azure-pipelines.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
- task: CMake@1
6666
inputs:
6767
workingDirectory: 'build' # Optional
68-
cmakeArgs: '-G "Visual Studio 16 2019" ..'
68+
cmakeArgs: '-G "Visual Studio 17 2022" ..'
6969
- task: CMake@1
7070
inputs:
7171
cmakeArgs: '--build . --config Release'
@@ -103,7 +103,7 @@ jobs:
103103
104104
- job: Windows_flang_clang
105105
pool:
106-
vmImage: 'windows-latest'
106+
vmImage: 'windows-2022'
107107
steps:
108108
- script: |
109109
set "PATH=C:\Miniconda\Scripts;C:\Miniconda\Library\bin;C:\Miniconda\Library\usr\bin;C:\Miniconda\condabin;%PATH%"
@@ -114,7 +114,7 @@ jobs:
114114
conda install --yes --quiet ninja flang
115115
mkdir build
116116
cd build
117-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
117+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
118118
cmake -G "Ninja" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DCMAKE_MT=mt -DCMAKE_BUILD_TYPE=Release -DMSVC_STATIC_CRT=ON ..
119119
cmake --build . --config Release
120120
ctest
@@ -178,7 +178,7 @@ jobs:
178178
cmake -DTARGET=CORE2 -DDYNAMIC_ARCH=1 -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_Fortran_COMPILER=gfortran-10 -DBUILD_SHARED_LIBS=ON ..
179179
cmake --build .
180180
ctest
181-
181+
182182
- job: OSX_Ifort_Clang
183183
pool:
184184
vmImage: 'macOS-10.15'

0 commit comments

Comments
 (0)