From e66dfe49e3df87b85d6b836a4dd89a549f85c2a7 Mon Sep 17 00:00:00 2001
From: Reinder Feenstra <reinderfeenstra@gmail.com>
Date: Fri, 10 May 2024 17:33:36 +0200
Subject: [PATCH] CI: removed ubuntu 20.04, added ubuntu 24.04

---
 .github/workflows/build.yml | 48 ++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ad9563b2..2636c20a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,8 +20,8 @@ jobs:
           build_deb: false
           defines: ""
 
-        - name: "ubuntu_20.04"
-          os: ubuntu-20.04
+        - name: "ubuntu_22.04"
+          os: ubuntu-22.04
           generator: "Unix Makefiles"
           arch: ""
           target: traintastic-client
@@ -30,8 +30,8 @@ jobs:
           build_deb: true
           defines: ""
 
-        - name: "ubuntu_22.04"
-          os: ubuntu-22.04
+        - name: "ubuntu_24.04"
+          os: ubuntu-24.04
           generator: "Unix Makefiles"
           arch: ""
           target: traintastic-client
@@ -206,18 +206,6 @@ jobs:
           defines: ""
           ccov: false
 
-        - name: "ubuntu_20.04"
-          os: ubuntu-20.04
-          generator: "Unix Makefiles"
-          arch: ""
-          toolset: ""
-          target: all
-          jobs: 4
-          build_type: Release
-          build_deb: true
-          defines: "-DENABLE_CLANG_TIDY=ON -DINSTALL_SYSTEMD_SERVICE=ON"
-          ccov: false
-
         - name: "ubuntu_22.04"
           os: ubuntu-22.04
           generator: "Unix Makefiles"
@@ -230,8 +218,20 @@ jobs:
           defines: "-DENABLE_CLANG_TIDY=ON -DINSTALL_SYSTEMD_SERVICE=ON"
           ccov: false
 
-        - name: "ubuntu_20.04 (debug+ccov)"
-          os: ubuntu-20.04
+        - name: "ubuntu_24.04"
+          os: ubuntu-24.04
+          generator: "Unix Makefiles"
+          arch: ""
+          toolset: ""
+          target: all
+          jobs: 4
+          build_type: Release
+          build_deb: true
+          defines: "-DENABLE_CLANG_TIDY=ON -DINSTALL_SYSTEMD_SERVICE=ON"
+          ccov: false
+
+        - name: "ubuntu_latest (debug+ccov)"
+          os: ubuntu-latest
           generator: "Unix Makefiles"
           arch: ""
           toolset: ""
@@ -418,14 +418,14 @@ jobs:
       fail-fast: false
       matrix:
         config:
-        - name: "ubuntu_20.04"
-          os: ubuntu-20.04
-          defines: ""
-
         - name: "ubuntu_22.04"
           os: ubuntu-22.04
           defines: ""
 
+        - name: "ubuntu_24.04"
+          os: ubuntu-24.04
+          defines: ""
+
         - name: "raspberrypios_10"
           os: [self-hosted, ARM64, RaspberryPi]
           defines: ""
@@ -494,7 +494,7 @@ jobs:
 
   build-manual:
     name: manual
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
     - uses: FranzDiebold/github-env-vars-action@v2
@@ -608,7 +608,7 @@ jobs:
   deploy:
     name: Deploy to website
     if: ${{ github.event_name == 'push' }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [package-innosetup, build-server, build-client, build-data, build-manual, build-manual-lua]
 
     steps: