From 2d38a04ae668e1bff4d6bbd7f7999d7c8f455506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Gl=C3=A4ser?= <dennis.a.glaeser@gmail.com>
Date: Thu, 21 Nov 2024 07:44:37 +0100
Subject: [PATCH] [ci] run on ubuntu-24.04

---
 .github/workflows/test_suite.yml | 36 +++++++++++++++++---------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/test_suite.yml b/.github/workflows/test_suite.yml
index ffaaeee..c98d48f 100644
--- a/.github/workflows/test_suite.yml
+++ b/.github/workflows/test_suite.yml
@@ -14,30 +14,32 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-22.04
-    container: dglaeser/compiler-images:${{ matrix.compiler }}
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
-          compiler: [gcc-14, clang-19-git]
+        compiler: [gcc-14, clang-18]
+        include:
+          - c_compiler: gcc-14
+            compiler: gcc-14
+          - cxx_compiler: g++-14
+            compiler: gcc-14
+          - c_compiler: clang-18
+            compiler: clang-18
+          - cxx_compiler: clang++-18
+            compiler: clang-18
     steps:
       - name: checkout-repository
         uses: actions/checkout@v2
 
-      # install of make can be omitted once the container provides it per default
-      - name: build-tests
+      - name: configure
         run: |
-          apt update && apt install make
-          echo "Using C compiler ${C_COMPILER}"
-          echo "Using C++ compiler ${CXX_COMPILER}"
           cd test
-            cmake -DCMAKE_C_COMPILER=${C_COMPILER} \
-                  -DCMAKE_CXX_COMPILER=${CXX_COMPILER} \
+            cmake -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} \
+                  -DCMAKE_CXX_COMPILER=${{ matrix.cxx_compiler }} \
                   -B build
-            cmake --build build
-          cd ..
 
-      - name: run-tests
-        run: |
-          cd test/build
-            ctest --output-on-failure
-          cd ..
+      - name: build
+        run: cd test && cmake --build build
+
+      - name: test
+        run: cd test/build && ctest --output-on-failure