From 0de799137514c195503bfb47381089608539cfd1 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Mon, 15 Nov 2021 19:50:18 +0100 Subject: [PATCH] ci: switching to Windows 2022 for MSVC 19.30 --- .github/workflows/ci-conan.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index cafcfc0b..6b917679 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -41,14 +41,12 @@ jobs: - { name: "Windows MSVC-19.29", os: windows-2019, - compiler: { type: MSVC, version: 19.29, std: 20 }, - vs_version: 16 + compiler: { type: MSVC, version: 19.29, std: 20 } } - { name: "Windows MSVC-19.30", - os: windows-2019, - compiler: { type: MSVC, version: 19.30, std: 23 }, - vs_version: 16 + os: windows-2022, + compiler: { type: MSVC, version: 19.30, std: 23 } } - { name: "Ubuntu GCC-10", @@ -146,10 +144,6 @@ jobs: conan profile update settings.compiler.cppstd=${{ matrix.config.compiler.std }} default conan profile update conf.tools.cmake.cmaketoolchain:generator=Ninja default conan profile show default - - name: Set Visual Studio version that provides required MSVC toolchain - if: matrix.config.compiler.type == 'MSVC' - run: | - conan profile update conf.tools.microsoft.msbuild:vs_version=${{ matrix.config.vs_version }} default # - name: Add support for clang-13 to Conan's settings.yml # # TODO Remove when Conan will support clang-13 # if: matrix.config.compiler.type == 'CLANG'