From 83b8d8dda575bab7ca46665556e60fd924ccb9b8 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 16 Oct 2026 09:44:17 +0200
Subject: [PATCH 1/2] Github action: Modernize CI

---
 .github/actions/install-windows/action.yml |  2 +-
 .github/workflows/ci.yml                   | 11 ++++++-----
 .github/workflows/clang-tidy.yml           |  7 ++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/actions/install-windows/action.yml b/.github/actions/install-windows/action.yml
index cb9ee53..9e03f89 100644
--- a/.github/actions/install-windows/action.yml
+++ b/.github/actions/install-windows/action.yml
@@ -6,5 +6,5 @@ runs:
     - name: Install packages
       run: |
         vcpkg install \
-          boost-variant:x64-windows
+          boost-variant
       shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a218bac..1e74026 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,9 +13,9 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          - "ubuntu:20.04"        # gcc  9.3.0, clang 10.0.0, cmake 3.16.3
           - "ubuntu:22.04"        # gcc 12.2.0, clang 15.0.7, cmake 3.24.2
           - "ubuntu:24.04"        # gcc 14.2.0, clang 18.1.3, cmake 3.28.3
+          - "ubuntu:26.04"
           - "debian:bookworm"     # gcc 12.2.0, clang 15.0.6, cmake 3.25.1
           - "debian:trixie"
           - "debian:testing"
@@ -86,11 +86,12 @@ jobs:
       - uses: ./.github/actions/ctest
 
   ubuntu-latest:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     timeout-minutes: 30
     env:
-      CC: clang-18
-      CXX: clang++-18
+      CC: clang-22
+      CXX: clang++-22
+      CXXFLAGS: -Wno-c++20-extensions -Wno-c2y-extensions
       BUILD_TYPE: Debug
     steps:
       - uses: actions/checkout@v7
@@ -108,7 +109,6 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-14
           - macos-15
           - macos-26
         build_type: [Debug]
@@ -138,6 +138,7 @@ jobs:
         os:
           - windows-2022
           - windows-2025
+          - windows-11-arm
     steps:
       - uses: actions/checkout@v7
         with:
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index a826116..97b5703 100644
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -16,16 +16,16 @@ jobs:
           - image: "debian:trixie"
             clang: 19
           - image: "debian:testing"
-            clang: 19
+            clang: 22
           - image: "debian:experimental"
-            clang: 20
+            clang: 24
     container:
       image: ${{ matrix.image }}
       env:
         BUILD_TYPE: Debug
         CC: clang-${{ matrix.clang }}
         CXX: clang++-${{ matrix.clang }}
-        CXXFLAGS: -Wno-c++20-extensions
+        CXXFLAGS: -Wno-c++20-extensions -Wno-c2y-extensions
         CPP_VERSION: 14
         APT_LISTCHANGES_FRONTEND: none
         DEBIAN_FRONTEND: noninteractive
@@ -37,6 +37,7 @@ jobs:
             clang-${{ matrix.clang }} \
             clang-tidy-${{ matrix.clang }} \
             cmake \
+            g++ \
             git \
             make
         shell: bash

From f65d99e35a311f50a348e715bbc42a00af8a18fd Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 16 Oct 2026 10:04:19 +0200
Subject: [PATCH 2/2] CMake: Update list of clang-tidy versions we are looking
 for

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 253a78b..cfc51d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,7 @@ find_package(Boost)
 #
 #-----------------------------------------------------------------------------
 message(STATUS "Looking for clang-tidy")
-find_program(CLANG_TIDY NAMES clang-tidy clang-tidy-20 clang-tidy-19 clang-tidy-18 clang-tidy-17 clang-tidy-16 clang-tidy-15)
+find_program(CLANG_TIDY NAMES clang-tidy clang-tidy-24 clang-tidy-23 clang-tidy-22 clang-tidy-21 clang-tidy-20 clang-tidy-19)
 
 if(CLANG_TIDY)
     message(STATUS "Looking for clang-tidy - found ${CLANG_TIDY}")