From 30db69822d1feaa55454114ec4522a506f3da6f1 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Sun, 26 Jul 2026 16:49:46 +0200
Subject: [PATCH] Github action: Modernize/fix CI

---
 .github/actions/build/action.yml |  2 +-
 .github/workflows/c.yml          | 24 +++++++++++++-----
 .github/workflows/java.yml       | 42 ++++++++++++++++++++++++++------
 3 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index 6637c62..508af9d 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -19,6 +19,6 @@ runs:
         working-directory: build
 
       - name: Run outline
-        run: build/tools/osmpbf-outline resources/sample.pbf
+        run: build/demo/osmpbf-outline resources/sample.pbf
         shell: bash
 
diff --git a/.github/workflows/c.yml b/.github/workflows/c.yml
index 30295d8..1f4afb5 100644
--- a/.github/workflows/c.yml
+++ b/.github/workflows/c.yml
@@ -11,7 +11,7 @@ jobs:
       CXXFLAGS: -Werror -Wall -pedantic
       BUILD_TYPE: Debug
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - uses: ./.github/actions/install-ubuntu
       - uses: ./.github/actions/build
 
@@ -23,7 +23,19 @@ jobs:
       CXXFLAGS: -Werror -Wall -pedantic
       BUILD_TYPE: Debug
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+      - uses: ./.github/actions/install-ubuntu
+      - uses: ./.github/actions/build
+
+  ubuntu26:
+    runs-on: ubuntu-26.04
+    env:
+      CC: gcc
+      CXX: g++
+      CXXFLAGS: -Werror -Wall -pedantic
+      BUILD_TYPE: Debug
+    steps:
+      - uses: actions/checkout@v7
       - uses: ./.github/actions/install-ubuntu
       - uses: ./.github/actions/build
 
@@ -35,7 +47,7 @@ jobs:
       CXXFLAGS: -Werror -Wall -pedantic
       BUILD_TYPE: Debug
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - uses: ./.github/actions/install-ubuntu
       - uses: ./.github/actions/build
 
@@ -48,7 +60,7 @@ jobs:
       CXXFLAGS: -Werror -Wall -pedantic -Wno-array-bounds
       BUILD_TYPE: Release
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - uses: ./.github/actions/install-ubuntu
       - uses: ./.github/actions/build
 
@@ -60,14 +72,14 @@ jobs:
       CXXFLAGS: -Werror -Wall -pedantic -Wno-nullability-extension
       BUILD_TYPE: Debug
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - uses: ./.github/actions/install-macos
       - uses: ./.github/actions/build
 
   windows:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - uses: ./.github/actions/install-windows
       - uses: ./.github/actions/build-windows
 
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index 49c9a9b..c9c483c 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -6,10 +6,10 @@ jobs:
   maven-ubuntu22:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - run: sudo apt-get install protobuf-compiler
       - name: Set up JDK 8
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: zulu
           java-version: 8
@@ -19,10 +19,23 @@ jobs:
   maven-ubuntu24:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - run: sudo apt-get install protobuf-compiler
       - name: Set up JDK 8
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
+        with:
+          distribution: zulu
+          java-version: 8
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml
+
+  maven-ubuntu26:
+    runs-on: ubuntu-26.04
+    steps:
+      - uses: actions/checkout@v7
+      - run: sudo apt-get install protobuf-compiler
+      - name: Set up JDK 8
+        uses: actions/setup-java@v5
         with:
           distribution: zulu
           java-version: 8
@@ -32,10 +45,10 @@ jobs:
   ant-ubuntu22:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - run: sudo apt-get install protobuf-compiler libprotobuf-java
       - name: Set up JDK 8
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: zulu
           java-version: 8
@@ -45,10 +58,23 @@ jobs:
   ant-ubuntu24:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - run: sudo apt-get install protobuf-compiler libprotobuf-java
       - name: Set up JDK 8
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
+        with:
+          distribution: zulu
+          java-version: 8
+      - name: Build with Ant
+        run: ant
+
+  ant-ubuntu26:
+    runs-on: ubuntu-26.04
+    steps:
+      - uses: actions/checkout@v7
+      - run: sudo apt-get install protobuf-compiler libprotobuf-java
+      - name: Set up JDK 8
+        uses: actions/setup-java@v5
         with:
           distribution: zulu
           java-version: 8