From 00794a70b0d79f759c7a25d8dbae8caf93a65411 Mon Sep 17 00:00:00 2001
From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Tue, 8 Apr 2025 10:00:37 -0700
Subject: [PATCH] Remove deprecated ubuntu-20.04 image from CI.

---
 .github/workflows/cmake.yml     | 15 ++-------------
 .github/workflows/configure.yml |  5 -----
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index bf7c2a88..bdeb0112 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -15,11 +15,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: Ubuntu 20.04 GCC
-            os: ubuntu-20.04
-            compiler: gcc
-            cxx-compiler: g++
-
           - name: Ubuntu GCC ASAN
             os: ubuntu-latest
             compiler: gcc
@@ -273,7 +268,7 @@ jobs:
 
           - name: Ubuntu GCC PPC64LE
             # qemu appears to be broken in newer versions of Ubuntu (see issue 1378)
-            os: ubuntu-20.04
+            os: ubuntu-latest
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc64le.cmake
             packages: qemu qemu-user gcc-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu libc-dev-ppc64el-cross
             gcov-exec: powerpc64le-linux-gnu-gcov
@@ -312,7 +307,7 @@ jobs:
 
           - name: Ubuntu GCC SPARC64
             # qemu appears to be broken in newer versions of Ubuntu (see issue 1378)
-            os: ubuntu-20.04
+            os: ubuntu-latest
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-sparc64.cmake
             packages: qemu qemu-user gcc-sparc64-linux-gnu g++-sparc64-linux-gnu libc-dev-sparc64-cross
             ldflags: -static
@@ -398,12 +393,6 @@ jobs:
              # Limit parallel test jobs to prevent wine errors
             parallels-jobs: 1
 
-          - name: Ubuntu 20.04 Clang 6
-            os: ubuntu-20.04
-            compiler: clang-6.0
-            cxx-compiler: clang++-6.0
-            packages: clang-6.0
-
           - name: Ubuntu Clang
             os: ubuntu-latest
             compiler: clang-15
diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml
index 6643edb1..391a9d44 100644
--- a/.github/workflows/configure.yml
+++ b/.github/workflows/configure.yml
@@ -16,11 +16,6 @@ jobs:
             compiler: gcc
             configure-args: --warn
 
-          - name: Ubuntu 20.04 GCC
-            os: ubuntu-20.04
-            compiler: gcc
-            configure-args: --warn
-
           - name: Ubuntu GCC OSB
             os: ubuntu-latest
             compiler: gcc
-- 
2.47.2