From e769e2bc3be567fae9d49e648249d7af2842e0ea Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 27 Oct 2024 11:55:49 +0100
Subject: [PATCH] Ubuntu 24.04

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 37b77b6f..7a5da1fb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,6 +24,7 @@ jobs:
             ubuntu: 22
             CXXFLAGS: -Wno-stringop-overread
           - name: Ubuntu-24
+            # Uses gcc 14.2.0, clang 18.1.3, cmake 3.28.3
             image: "ubuntu:24.04"
             ubuntu: 24
             CXXFLAGS: -Wno-stringop-overread -Wno-dangling-reference
@@ -203,24 +204,24 @@ jobs:
       - uses: ./.github/actions/ctest
 
   ubuntu-latest:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 40
     env:
-      CC: clang-15
-      CXX: clang++-15
+      CC: clang-18
+      CXX: clang++-18
       BUILD_TYPE: Dev
       WITH_PROJ: ON
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Install new clang
-        run: |
-          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/llvm-snapshot.asc
-          sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main'
-          sudo apt-get update -qq
-          sudo apt-get install -yq clang-15
-        shell: bash
+#      - name: Install new clang
+#        run: |
+#          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/llvm-snapshot.asc
+#          sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main'
+#          sudo apt-get update -qq
+#          sudo apt-get install -yq clang-15
+#        shell: bash
       - uses: ./.github/actions/install-ubuntu
       - uses: ./.github/actions/install-protozero
       - uses: ./.github/actions/cmake