Merge pull request #3577 from martin-frbg/azure_win2022
Update Windows jobs in Azure CI to use Windows2022
This commit is contained in:
commit
0ee2d15fdb
|
@ -65,7 +65,7 @@ jobs:
|
||||||
- task: CMake@1
|
- task: CMake@1
|
||||||
inputs:
|
inputs:
|
||||||
workingDirectory: 'build' # Optional
|
workingDirectory: 'build' # Optional
|
||||||
cmakeArgs: '-G "Visual Studio 16 2019" ..'
|
cmakeArgs: '-G "Visual Studio 17 2022" ..'
|
||||||
- task: CMake@1
|
- task: CMake@1
|
||||||
inputs:
|
inputs:
|
||||||
cmakeArgs: '--build . --config Release'
|
cmakeArgs: '--build . --config Release'
|
||||||
|
@ -103,7 +103,7 @@ jobs:
|
||||||
|
|
||||||
- job: Windows_flang_clang
|
- job: Windows_flang_clang
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'windows-latest'
|
vmImage: 'windows-2022'
|
||||||
steps:
|
steps:
|
||||||
- script: |
|
- script: |
|
||||||
set "PATH=C:\Miniconda\Scripts;C:\Miniconda\Library\bin;C:\Miniconda\Library\usr\bin;C:\Miniconda\condabin;%PATH%"
|
set "PATH=C:\Miniconda\Scripts;C:\Miniconda\Library\bin;C:\Miniconda\Library\usr\bin;C:\Miniconda\condabin;%PATH%"
|
||||||
|
@ -114,7 +114,7 @@ jobs:
|
||||||
conda install --yes --quiet ninja flang
|
conda install --yes --quiet ninja flang
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
|
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
|
||||||
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 ..
|
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 ..
|
||||||
cmake --build . --config Release
|
cmake --build . --config Release
|
||||||
ctest
|
ctest
|
||||||
|
@ -178,7 +178,7 @@ jobs:
|
||||||
cmake -DTARGET=CORE2 -DDYNAMIC_ARCH=1 -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_Fortran_COMPILER=gfortran-10 -DBUILD_SHARED_LIBS=ON ..
|
cmake -DTARGET=CORE2 -DDYNAMIC_ARCH=1 -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_Fortran_COMPILER=gfortran-10 -DBUILD_SHARED_LIBS=ON ..
|
||||||
cmake --build .
|
cmake --build .
|
||||||
ctest
|
ctest
|
||||||
|
|
||||||
- job: OSX_Ifort_Clang
|
- job: OSX_Ifort_Clang
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'macOS-10.15'
|
vmImage: 'macOS-10.15'
|
||||||
|
|
Loading…
Reference in New Issue