From cffbe661b1b6f6710ce416532858646e7b39bc98 Mon Sep 17 00:00:00 2001
From: Jochen Topf <jochen@topf.org>
Date: Fri, 27 May 2022 11:03:37 +0200
Subject: [PATCH] Github Actions: Build on Ubuntu 20.04/22.04, not 18.04 any
 more

---
 .github/workflows/c.yml    | 40 +++++++++++++++++++-------------------
 .github/workflows/java.yml | 34 ++++++++++++++++----------------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/c.yml b/.github/workflows/c.yml
index bb13ac5..9814a82 100644
--- a/.github/workflows/c.yml
+++ b/.github/workflows/c.yml
@@ -3,18 +3,6 @@ name: C CI
 on: [push, pull_request]
 
 jobs:
-  ubuntu18:
-    runs-on: ubuntu-18.04
-    env:
-      CC: gcc
-      CXX: g++
-      CXXFLAGS: -Werror -Wall -pedantic
-      BUILD_TYPE: Debug
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ./.github/actions/install-ubuntu
-      - uses: ./.github/actions/build
-
   ubuntu20:
     runs-on: ubuntu-20.04
     env:
@@ -27,11 +15,11 @@ jobs:
       - uses: ./.github/actions/install-ubuntu
       - uses: ./.github/actions/build
 
-  ubuntu20-clang:
-    runs-on: ubuntu-20.04
+  ubuntu22:
+    runs-on: ubuntu-22.04
     env:
-      CC: clang-10
-      CXX: clang++-10
+      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
 
-  ubuntu20-release:
-    runs-on: ubuntu-20.04
+  ubuntu22-clang:
+    runs-on: ubuntu-22.04
+    env:
+      CC: clang-12
+      CXX: clang++-12
+      CXXFLAGS: -Werror -Wall -pedantic
+      BUILD_TYPE: Debug
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ./.github/actions/install-ubuntu
+      - uses: ./.github/actions/build
+
+  ubuntu22-release:
+    runs-on: ubuntu-22.04
     env:
       CC: gcc
       CXX: g++
@@ -52,8 +52,8 @@ jobs:
       - uses: ./.github/actions/install-ubuntu
       - uses: ./.github/actions/build
 
-  ubuntu20-make:
-    runs-on: ubuntu-20.04
+  ubuntu22-make:
+    runs-on: ubuntu-22.04
     env:
       CC: gcc
       CXX: g++
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index f244c20..4397973 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -3,18 +3,6 @@ name: Java CI
 on: [push, pull_request]
 
 jobs:
-  maven-ubuntu18:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-      - run: sudo apt-get install protobuf-compiler
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Build with Maven
-        run: mvn -B package --file pom.xml
-
   maven-ubuntu20:
     runs-on: ubuntu-20.04
     steps:
@@ -27,17 +15,17 @@ jobs:
       - name: Build with Maven
         run: mvn -B package --file pom.xml
 
-  ant-ubuntu18:
-    runs-on: ubuntu-18.04
+  maven-ubuntu22:
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
-      - run: sudo apt-get install protobuf-compiler libprotobuf-java
+      - run: sudo apt-get install protobuf-compiler
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
-      - name: Build with Ant
-        run: ant
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml
 
   ant-ubuntu20:
     runs-on: ubuntu-20.04
@@ -51,3 +39,15 @@ jobs:
       - name: Build with Ant
         run: ant
 
+  ant-ubuntu22:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v2
+      - run: sudo apt-get install protobuf-compiler libprotobuf-java
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build with Ant
+        run: ant
+