From 20f053457ec4be9775da1c2ac14b591bd23c766a Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Mon, 2 Jan 2023 11:55:50 +0100 Subject: workflows/ci: add VS 2022 builds This includes bumping the Boost version, because windows-2022 runners can no longer build older releases. --- .github/workflows/ci.yml | 7 ++++--- 3rdparty/winapi/utf8 | 2 +- cmake | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ea033b..8d51d0b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,15 +21,16 @@ jobs: build: strategy: matrix: - toolset: [mingw, vs2019] + toolset: [mingw, vs2019, vs2022] platform: [x64, x86] configuration: [Debug, RelWithDebInfo] include: - - boost-version: 1.72.0 + - boost-version: 1.81.0 # MinGW builds are done on Linux, since it's more up-to-date there, # and it's much faster. - {toolset: mingw, os: ubuntu-latest} - {toolset: vs2019, os: windows-2019} + - {toolset: vs2022, os: windows-2022} runs-on: '${{ matrix.os }}' name: 'Build: ${{ matrix.toolset }} / ${{ matrix.platform }} / ${{ matrix.configuration }}' defaults: @@ -92,7 +93,7 @@ jobs: TOOLSET: mingw PLATFORM: auto CONFIGURATION: Debug - BOOST_VERSION: 1.65.0 + BOOST_VERSION: 1.81.0 CMAKE_FLAGS: -D WINAPI_COMMON_TESTS=OFF steps: # This is rather stupid. In order to build Doxygen docs, I need a working diff --git a/3rdparty/winapi/utf8 b/3rdparty/winapi/utf8 index 721ca6f..03385b2 160000 --- a/3rdparty/winapi/utf8 +++ b/3rdparty/winapi/utf8 @@ -1 +1 @@ -Subproject commit 721ca6fc423e85f8c1ecc93740b3ed044fc65c21 +Subproject commit 03385b2e14bf1b8fa3d7f97e7319dfd54acf9451 diff --git a/cmake b/cmake index 2cd523c..b230fff 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 2cd523ccab34b90c37ea9c0057af1192cb64dd95 +Subproject commit b230fffce638cdac8837ba9d9d343d9a93cef2ee -- cgit v1.2.3