From fc0128b65ed0445226d63ca22c7471c7fb729b6c Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 27 Oct 2024 17:16:52 +0100
Subject: [PATCH] Github actions: Modernize CI

---
 .github/actions/install-ubuntu/action.yml |  1 +
 .github/workflows/ci.yml                  | 19 ++++++-------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/actions/install-ubuntu/action.yml b/.github/actions/install-ubuntu/action.yml
index bd61215..57c14ca 100644
--- a/.github/actions/install-ubuntu/action.yml
+++ b/.github/actions/install-ubuntu/action.yml
@@ -7,6 +7,7 @@ runs:
       run: |
         sudo apt-get update -qq
         sudo apt-get install -yq \
+             libbz2-dev \
              libgdal-dev \
              libgeos-dev \
              pandoc \
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a1a35ef..79504cb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -185,19 +185,12 @@ jobs:
       - uses: ./.github/actions/ctest
 
   ubuntu-latest:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
-      CC: clang-15
-      CXX: clang++-15
+      CC: clang-18
+      CXX: clang++-18
       BUILD_TYPE: Dev
     steps:
-      - 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: actions/checkout@v4
       - uses: ./.github/actions/install-ubuntu
       - uses: ./.github/actions/cmake
@@ -209,11 +202,11 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - "macos-12"
-          - "macos-13"
+          - "macos-14"
+          - "macos-15"
         build_type: [Dev]
         include:
-          - os: "macos-12"
+          - os: "macos-14"
             build_type: Release
     runs-on: ${{ matrix.os }}
     env: