diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2021-12-15 20:10:48 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2021-12-15 20:19:56 +0300 |
| commit | d021eae1cf9806282745935391a5ca282f4b5999 (patch) | |
| tree | 11f7eaf21628681296559ad97777405377386cde /.github | |
| parent | v3.3 (diff) | |
| download | cmake-common-d021eae1cf9806282745935391a5ca282f4b5999.tar.gz cmake-common-d021eae1cf9806282745935391a5ca282f4b5999.zip | |
support VS 2022
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/basic.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/boost_toolsets.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/example_toolsets.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/msvc_versions.yml | 6 |
4 files changed, 20 insertions, 8 deletions
diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index f7d8fc5..6adf3ac 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -21,9 +21,9 @@ jobs: os: strategy: matrix: - os: [ubuntu-18.04, ubuntu-20.04, windows-2016, windows-2019, macos-10.15, macos-11] + os: [ubuntu-18.04, ubuntu-20.04, windows-2016, windows-2019, windows-2022, macos-10.15, macos-11] include: - - boost-version: 1.72.0 + - boost-version: 1.78.0 runs-on: '${{ matrix.os }}' name: 'Image: ${{ matrix.os }}' defaults: @@ -56,7 +56,7 @@ jobs: python-version: [3.6, 3.7, 3.8, 3.9, 3.x] include: - os: ubuntu-latest - - boost-version: 1.72.0 + - boost-version: 1.78.0 runs-on: '${{ matrix.os }}' name: 'Python ${{ matrix.python-version }}' defaults: diff --git a/.github/workflows/boost_toolsets.yml b/.github/workflows/boost_toolsets.yml index ba027c6..d7c6fc4 100644 --- a/.github/workflows/boost_toolsets.yml +++ b/.github/workflows/boost_toolsets.yml @@ -15,10 +15,11 @@ jobs: boost-version: [1.58.0, 1.65.0, 1.72.0] toolset: [auto, clang, clang-cl, gcc, mingw, msvc] cygwin: [0, 1] - os: [ubuntu-latest, windows-2016, windows-2019] + os: [ubuntu-latest, windows-2016, windows-2019, windows-2022] include: # Prettier run names. + - {os: windows-2022, name: Windows 2022} - {os: windows-2019, name: Windows 2019} - {os: windows-2016, name: Windows 2016} - {os: ubuntu-latest, name: Ubuntu} @@ -44,6 +45,10 @@ jobs: # On Linux/Cygwin, everything should be fine though. - toolset: clang boost-version: 1.58.0 + os: windows-2022 + libraries: filesystem program_options regex system + - toolset: clang + boost-version: 1.58.0 os: windows-2019 libraries: filesystem program_options regex system - toolset: clang @@ -58,7 +63,8 @@ jobs: # Cygwin: no MSVC/clang-cl. - {cygwin: 1, toolset: msvc} - {cygwin: 1, toolset: clang-cl} - # Cygwin is the same on Windows Server 2016 & 2019. + # Cygwin is the same on different Windows versions. + - {os: windows-2019, cygwin: 1} - {os: windows-2016, cygwin: 1} # clang-cl is only supported by Boost.Build since 1.69 (see the # boost_clang_windows.yml workflow). diff --git a/.github/workflows/example_toolsets.yml b/.github/workflows/example_toolsets.yml index a55c7b7..d98cfe0 100644 --- a/.github/workflows/example_toolsets.yml +++ b/.github/workflows/example_toolsets.yml @@ -15,10 +15,11 @@ jobs: example: [simple, static, dynamic] toolset: [auto, clang, clang-cl, gcc, mingw, msvc] cygwin: [0, 1] - os: [ubuntu-latest, windows-2016, windows-2019] + os: [ubuntu-latest, windows-2016, windows-2019, windows-2022] include: # Prettier run names. + - {os: windows-2022, name: Windows 2022} - {os: windows-2019, name: Windows 2019} - {os: windows-2016, name: Windows 2016} - {os: ubuntu-latest, name: Ubuntu} @@ -58,7 +59,8 @@ jobs: # Cygwin: no MSVC/clang-cl. - {cygwin: 1, toolset: msvc} - {cygwin: 1, toolset: clang-cl} - # Cygwin is the same on Windows Server 2016 & 2019. + # Cygwin is the same on different Windows versions. + - {os: windows-2019, cygwin: 1} - {os: windows-2016, cygwin: 1} runs-on: '${{ matrix.os }}' diff --git a/.github/workflows/msvc_versions.yml b/.github/workflows/msvc_versions.yml index 91d49c9..c1b2700 100644 --- a/.github/workflows/msvc_versions.yml +++ b/.github/workflows/msvc_versions.yml @@ -16,21 +16,25 @@ jobs: - msvc140 - msvc141 - msvc142 + - msvc143 - vs2015 - vs2017 - vs2019 + - vs2022 include: # Runner image. - {toolset: msvc140, os: windows-2016} - {toolset: msvc141, os: windows-2016} - {toolset: msvc142, os: windows-2019} + - {toolset: msvc143, os: windows-2022} - {toolset: vs2015, os: windows-2016} - {toolset: vs2017, os: windows-2016} - {toolset: vs2019, os: windows-2019} + - {toolset: vs2022, os: windows-2022} # Boost version. - - boost-version: 1.72.0 + - boost-version: 1.78.0 # Some Boost libraries commonly used by me. - libraries: filesystem program_options regex system test |