From b682fd0285ffa2f3c34c222fd7be445684be51e2 Mon Sep 17 00:00:00 2001
From: Alexey Rybalchenko <alexryba@gmail.com>
Date: Tue, 17 Feb 2026 09:57:51 +0100
Subject: [PATCH] Update CI

---
 .github/workflows/ci.yml | 49 +++++++++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dd203ea..8ff5d95 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,27 +7,50 @@ on:
     branches: [ master, dev ]
 
 jobs:
-  build-linux:
+  build-ubuntu:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-22.04, ubuntu-24.04]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y cmake ninja-build libboost-dev libfmt-dev
+
+    - name: Configure
+      run: |
+        cmake -B build -G Ninja \
+          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+          -DDISABLE_COLOR=ON \
+          -DUSE_EXTERNAL_FMT=ON \
+          -DUSE_BOOST_PRETTY_FUNCTION=ON
+
+    - name: Build
+      run: cmake --build build
+
+    - name: Test
+      run: |
+        cd build
+        ctest -V --output-on-failure
+
+  build-fedora:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        fedora: [38, 39, 40]
-        include:
-          - fedora: 38
-            gcc: 13
-          - fedora: 39
-            gcc: 13
-          - fedora: 40
-            gcc: 14
+        fedora: [40, 41, 42]
 
-    container: ghcr.io/fairrootgroup/fairmq-dev/fedora-${{ matrix.fedora }}
+    container: fedora:${{ matrix.fedora }}
 
     steps:
     - uses: actions/checkout@v4
 
-    - name: Install additional dependencies
+    - name: Install dependencies
       run: |
-        dnf install -y fmt-devel || true
+        dnf install -y gcc-c++ cmake ninja-build boost-devel fmt-devel
 
     - name: Configure
       run: |
@@ -49,7 +72,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-13, macos-14, macos-15]
+        os: [macos-14, macos-15, macos-15-intel]
 
     steps:
     - uses: actions/checkout@v4