From 66c007d0728b6565f31f4d35e3d92625e380cf16 Mon Sep 17 00:00:00 2001
From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 9 Feb 2025 18:36:34 +0100
Subject: [PATCH] ci: Drop ubuntu-20 in favor of ubuntu-22

---
 .github/workflows/build.yaml           | 60 +++++++-------------------
 .github/workflows/codeql-analysis.yaml |  2 +-
 2 files changed, 17 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 558171ce0..8e356769c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -26,32 +26,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-20.04
-            compiler: gcc
-            version: "8"
-
-          - os: ubuntu-20.04
-            compiler: gcc
-            version: "9"
-
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             compiler: gcc
-            version: "10"
-
-          - os: ubuntu-20.04
-            compiler: clang
-            version: "9"
-
-          - os: ubuntu-20.04
-            compiler: clang
-            version: "10"
-
-          - os: ubuntu-20.04
-            compiler: clang
             version: "11"
 
-          - os: ubuntu-20.04
-            compiler: clang
+          - os: ubuntu-22.04
+            compiler: gcc
             version: "12"
 
           - os: ubuntu-22.04
@@ -66,14 +46,6 @@ jobs:
             compiler: clang
             version: "15"
 
-          - os: ubuntu-22.04
-            compiler: gcc
-            version: "11"
-
-          - os: ubuntu-22.04
-            compiler: gcc
-            version: "12"
-
           - os: ubuntu-24.04
             compiler: gcc
             version: "13"
@@ -280,7 +252,7 @@ jobs:
       matrix:
         include:
           - name: Linux GCC debug + in source
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             CC: gcc
             CXX: g++
             BUILDDIR: .
@@ -289,7 +261,7 @@ jobs:
             apt_get: elfutils libhiredis-dev libzstd-dev
 
           - name: Linux GCC 32-bit
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             CC: gcc
             CXX: g++
             CFLAGS: -m32 -g -O2
@@ -299,7 +271,7 @@ jobs:
             apt_get: elfutils gcc-multilib g++-multilib lib32stdc++-10-dev
 
           - name: Linux GCC CUDA
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             CC: gcc
             CXX: g++
             CMAKE_PARAMS: -DCMAKE_BUILD_TYPE=CI
@@ -307,13 +279,13 @@ jobs:
             apt_get: elfutils libhiredis-dev libzstd-dev
 
           - name: Linux MinGW 32-bit
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             CMAKE_PARAMS: -DCMAKE_BUILD_TYPE=CI -D CMAKE_TOOLCHAIN_FILE=../toolchains/i686-w64-mingw32-posix.cmake
             RUN_TESTS: none
             apt_get: elfutils mingw-w64
 
           - name: Linux MinGW 64-bit
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             CMAKE_PARAMS: -DCMAKE_BUILD_TYPE=CI -D CMAKE_TOOLCHAIN_FILE=../toolchains/x86_64-w64-mingw32-posix.cmake
             RUN_TESTS: unittest-in-wine
             apt_get: elfutils mingw-w64 wine
@@ -407,7 +379,7 @@ jobs:
             RUN_TESTS: none
 
           - name: Clang address & UB sanitizer
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             CC: clang
             CXX: clang++
             CMAKE_PARAMS: -DCMAKE_BUILD_TYPE=CI -DENABLE_SANITIZER_ADDRESS=ON -DENABLE_SANITIZER_UNDEFINED_BEHAVIOR=ON
@@ -415,7 +387,7 @@ jobs:
             apt_get: elfutils libzstd-dev libhiredis-dev
 
           - name: Clang static analyzer
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             CC: clang
             CXX: clang++
             CMAKE_PREFIX: scan-build
@@ -423,7 +395,7 @@ jobs:
             apt_get: libzstd-dev libhiredis-dev
 
           - name: Linux binary
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             CC: gcc
             CXX: g++
             SPECIAL: build-and-verify-package
@@ -431,26 +403,26 @@ jobs:
             apt_get: elfutils libzstd-dev libhiredis-dev ninja-build
 
           - name: Source package
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             CC: gcc
             CXX: g++
             SPECIAL: build-and-verify-source-package
             apt_get: elfutils libzstd-dev libhiredis-dev ninja-build asciidoctor
 
           - name: HTML documentation
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             EXTRA_CMAKE_BUILD_FLAGS: --target doc-html
             RUN_TESTS: none
             apt_get: libzstd-dev libhiredis-dev asciidoctor
 
           - name: Manual page
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             EXTRA_CMAKE_BUILD_FLAGS: --target doc-man-page
             RUN_TESTS: none
             apt_get: libzstd-dev libhiredis-dev asciidoctor
 
           - name: Clang-Tidy
-            os: ubuntu-20.04
+            os: ubuntu-22.04
             CC: clang-12
             CXX: clang++-12
             RUN_TESTS: none
@@ -535,7 +507,7 @@ jobs:
   check_format:
     timeout-minutes: 30
     name: Code formatting
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
     steps:
diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml
index 99b46fafd..b36bfc3c7 100644
--- a/.github/workflows/codeql-analysis.yaml
+++ b/.github/workflows/codeql-analysis.yaml
@@ -27,7 +27,7 @@ jobs:
       contents: read  # for actions/checkout to fetch code
       security-events: write  # for github/codeql-action/analyze to upload SARIF results
     name: Analyze
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Checkout repository
-- 
2.47.2