From c3eba6ac6be2e21af33a1b2ec97634cd01bcc447 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Fri, 24 Apr 2026 21:29:18 +0300
Subject: [PATCH] Update ci.yml

---
 .github/workflows/ci.yml | 41 +++++++++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f85feea..adf461b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,14 +33,17 @@ jobs:
             os: ubuntu-latest
           - toolset: gcc-10
             cxxstd: "03,11,14,17,2a"
-            os: ubuntu-22.04
+            container: ubuntu:22.04
+            os: ubuntu-latest
             install: g++-10
           - toolset: gcc-11
             cxxstd: "03,11,14,17,2a"
-            os: ubuntu-22.04
+            container: ubuntu:22.04
+            os: ubuntu-latest
           - toolset: gcc-12
             cxxstd: "03,11,14,17,20,2b"
-            os: ubuntu-22.04
+            container: ubuntu:22.04
+            os: ubuntu-latest
             install: g++-12
           - toolset: gcc-13
             cxxstd: "03,11,14,17,20,2b"
@@ -55,8 +58,13 @@ jobs:
           - toolset: gcc-15
             cxxstd: "03,11,14,17,20,23,2c"
             os: ubuntu-latest
-            container: ubuntu:25.04
+            container: ubuntu:26.04
             install: g++-15
+          - toolset: gcc-16
+            cxxstd: "03,11,14,17,20,23,2c"
+            os: ubuntu-latest
+            container: ubuntu:26.04
+            install: g++-16
           - toolset: clang
             compiler: clang++-6.0
             cxxstd: "03,11,14,17"
@@ -150,9 +158,15 @@ jobs:
           - toolset: clang
             compiler: clang++-21
             cxxstd: "03,11,14,17,20,23,2c"
-            container: ubuntu:25.10
+            container: ubuntu:26.04
             os: ubuntu-latest
             install: clang-21
+          - toolset: clang
+            compiler: clang++-22
+            cxxstd: "03,11,14,17,20,23,2c"
+            container: ubuntu:26.04
+            os: ubuntu-latest
+            install: clang-22
           - toolset: clang
             os: macos-14
             cxxstd: "03,11,14,17,20,2b"
@@ -238,8 +252,12 @@ jobs:
             cxxstd: "14,17,20,latest"
             addrmd: 32,64
             os: windows-2022
+          - toolset: msvc-14.5
+            cxxstd: "14,17,20,latest"
+            addrmd: 32,64
+            os: windows-2025-vs2026
           - toolset: clang-win
-            cxxstd: "14,17,latest"
+            cxxstd: "14,17,20,latest"
             addrmd: 32,64
             os: windows-2022
           - toolset: gcc
@@ -547,7 +565,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v6
-      - uses: Jimver/cuda-toolkit@v0.2.30
+
+      - uses: Jimver/cuda-toolkit@v0.2.35
         with:
           cuda: '11.7.1'
           linux-local-args: '["--toolkit"]'
@@ -582,17 +601,16 @@ jobs:
           nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -std=c++17 -c test/mp_count_if.cpp
 
   cuda-windows:
-    runs-on: windows-latest
+    runs-on: windows-2025
 
     steps:
       - uses: actions/checkout@v6
-      - uses: Jimver/cuda-toolkit@v0.2.30
+
+      - uses: Jimver/cuda-toolkit@v0.2.35
         with:
           use-local-cache: false
           use-github-cache: false
 
-      - uses: ilammy/msvc-dev-cmd@v1
-
       - name: Setup Boost
         run: |
           cd ..
@@ -603,6 +621,7 @@ jobs:
       - name: Run Tests
         shell: cmd
         run: |
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
           nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -c test/mp11.cpp || exit /b
           nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -c test/mp_all.cpp || exit /b
           nvcc -x cu -I ./include -I ../assert/include -I ../config/include -I ../core/include -c test/mp_any.cpp || exit /b