mirror of
https://github.com/mpusz/mp-units.git
synced 2025-08-06 05:34:27 +02:00
ci: switching to Windows 2022 for MSVC 19.30
This commit is contained in:
12
.github/workflows/ci-conan.yml
vendored
12
.github/workflows/ci-conan.yml
vendored
@@ -41,14 +41,12 @@ jobs:
|
|||||||
- {
|
- {
|
||||||
name: "Windows MSVC-19.29",
|
name: "Windows MSVC-19.29",
|
||||||
os: windows-2019,
|
os: windows-2019,
|
||||||
compiler: { type: MSVC, version: 19.29, std: 20 },
|
compiler: { type: MSVC, version: 19.29, std: 20 }
|
||||||
vs_version: 16
|
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
name: "Windows MSVC-19.30",
|
name: "Windows MSVC-19.30",
|
||||||
os: windows-2019,
|
os: windows-2022,
|
||||||
compiler: { type: MSVC, version: 19.30, std: 23 },
|
compiler: { type: MSVC, version: 19.30, std: 23 }
|
||||||
vs_version: 16
|
|
||||||
}
|
}
|
||||||
- {
|
- {
|
||||||
name: "Ubuntu GCC-10",
|
name: "Ubuntu GCC-10",
|
||||||
@@ -146,10 +144,6 @@ jobs:
|
|||||||
conan profile update settings.compiler.cppstd=${{ matrix.config.compiler.std }} default
|
conan profile update settings.compiler.cppstd=${{ matrix.config.compiler.std }} default
|
||||||
conan profile update conf.tools.cmake.cmaketoolchain:generator=Ninja default
|
conan profile update conf.tools.cmake.cmaketoolchain:generator=Ninja default
|
||||||
conan profile show 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
|
# - name: Add support for clang-13 to Conan's settings.yml
|
||||||
# # TODO Remove when Conan will support clang-13
|
# # TODO Remove when Conan will support clang-13
|
||||||
# if: matrix.config.compiler.type == 'CLANG'
|
# if: matrix.config.compiler.type == 'CLANG'
|
||||||
|
Reference in New Issue
Block a user