From 8086007f410e0b30ed400872396d3aef386aff43 Mon Sep 17 00:00:00 2001 From: Matt Borland Date: Mon, 27 Oct 2025 10:11:21 +0100 Subject: [PATCH 1/2] Update and remove old windows toolchains --- .github/workflows/ci.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 883c095381..3d5a87c50a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -473,14 +473,6 @@ jobs: fail-fast: false matrix: include: - - toolset: msvc-14.0 - cxxstd: "11" - addrmd: 64 - os: windows-2019 - - toolset: msvc-14.2 - cxxstd: "14" - addrmd: 64 - os: windows-2019 - toolset: msvc-14.3 cxxstd: "20" addrmd: 64 @@ -492,7 +484,7 @@ jobs: - toolset: gcc cxxstd: "17" addrmd: 64 - os: windows-2019 + os: windows-2022 runs-on: ${{matrix.os}} @@ -538,8 +530,8 @@ jobs: include: - { os: ubuntu-22.04, build_shared: ON, build_type: Debug, generator: 'Unix Makefiles' } - { os: ubuntu-22.04, build_shared: OFF, build_type: Debug, generator: 'Unix Makefiles' } - - { os: windows-2019, build_shared: ON, build_type: Debug, generator: 'Visual Studio 16 2019' } - - { os: windows-2019, build_shared: OFF, build_type: Debug, generator: 'Visual Studio 16 2019' } + - { os: windows-2025, build_shared: ON, build_type: Debug, generator: 'Visual Studio 17 2022' } + - { os: windows-2025, build_shared: OFF, build_type: Debug, generator: 'Visual Studio 17 2022' } timeout-minutes: 120 runs-on: ${{matrix.os}} From f2eac1c85556425950c88243e3424a45f6d255ac Mon Sep 17 00:00:00 2001 From: Matt Borland Date: Mon, 27 Oct 2025 10:11:49 +0100 Subject: [PATCH 2/2] Update macos toolchains --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d5a87c50a..24a0b1466b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -257,10 +257,10 @@ jobs: - toolset: clang cxxstd: "20" - os: macos-13 + os: macos-14 - toolset: clang cxxstd: "20" - os: macos-14 + os: macos-15 runs-on: ${{matrix.os}} container: