From 32c3e921665b1fcda31f39da9a7408f8453e110a Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Wed, 11 Jun 2025 10:41:43 +0200
Subject: [PATCH] Update CI to run on Ubuntu 22.04 and 24.04

---
 .github/workflows/c.yml    | 36 ++++++++++++++++++------------------
 .github/workflows/java.yml | 36 ++++++++++++++++++------------------
 CMakeLists.txt             |  2 +-
 3 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/c.yml b/.github/workflows/c.yml
index 2037183..fa1e119 100644
--- a/.github/workflows/c.yml
+++ b/.github/workflows/c.yml
@@ -3,18 +3,6 @@ name: C CI
 on: [push, pull_request]
 
 jobs:
-  ubuntu20:
-    runs-on: ubuntu-20.04
-    env:
-      CC: gcc
-      CXX: g++
-      CXXFLAGS: -Werror -Wall -pedantic
-      BUILD_TYPE: Debug
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/install-ubuntu
-      - uses: ./.github/actions/build
-
   ubuntu22:
     runs-on: ubuntu-22.04
     env:
@@ -27,11 +15,11 @@ jobs:
       - uses: ./.github/actions/install-ubuntu
       - uses: ./.github/actions/build
 
-  ubuntu22-clang:
-    runs-on: ubuntu-22.04
+  ubuntu24:
+    runs-on: ubuntu-24.04
     env:
-      CC: clang-15
-      CXX: clang++-15
+      CC: gcc
+      CXX: g++
       CXXFLAGS: -Werror -Wall -pedantic
       BUILD_TYPE: Debug
     steps:
@@ -39,8 +27,20 @@ jobs:
       - uses: ./.github/actions/install-ubuntu
       - uses: ./.github/actions/build
 
-  ubuntu22-release:
-    runs-on: ubuntu-22.04
+  ubuntu24-clang:
+    runs-on: ubuntu-24.04
+    env:
+      CC: clang-18
+      CXX: clang++-18
+      CXXFLAGS: -Werror -Wall -pedantic
+      BUILD_TYPE: Debug
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/install-ubuntu
+      - uses: ./.github/actions/build
+
+  ubuntu24-release:
+    runs-on: ubuntu-24.04
     env:
       CC: gcc
       CXX: g++
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index 22382c4..49c9a9b 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -3,19 +3,6 @@ name: Java CI
 on: [push, pull_request]
 
 jobs:
-  maven-ubuntu20:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v4
-      - run: sudo apt-get install protobuf-compiler
-      - name: Set up JDK 8
-        uses: actions/setup-java@v4
-        with:
-          distribution: zulu
-          java-version: 8
-      - name: Build with Maven
-        run: mvn -B package --file pom.xml
-
   maven-ubuntu22:
     runs-on: ubuntu-22.04
     steps:
@@ -29,18 +16,18 @@ jobs:
       - name: Build with Maven
         run: mvn -B package --file pom.xml
 
-  ant-ubuntu20:
-    runs-on: ubuntu-20.04
+  maven-ubuntu24:
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - run: sudo apt-get install protobuf-compiler libprotobuf-java
+      - run: sudo apt-get install protobuf-compiler
       - name: Set up JDK 8
         uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: 8
-      - name: Build with Ant
-        run: ant
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml
 
   ant-ubuntu22:
     runs-on: ubuntu-22.04
@@ -55,3 +42,16 @@ jobs:
       - name: Build with Ant
         run: ant
 
+  ant-ubuntu24:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+      - run: sudo apt-get install protobuf-compiler libprotobuf-java
+      - name: Set up JDK 8
+        uses: actions/setup-java@v4
+        with:
+          distribution: zulu
+          java-version: 8
+      - name: Build with Ant
+        run: ant
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90644c0..6ef3332 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.10)
 
 project(osmpbf VERSION 1.5.0)