From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Tue, 8 Apr 2025 17:00:37 +0000 (-0700)
Subject: Remove deprecated ubuntu-20.04 image from CI.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07578f9c18ae9f349e80bbf8f449a4914bed3eec;p=thirdparty%2Fzlib-ng.git

Remove deprecated ubuntu-20.04 image from CI.
---

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 4ad41af6..92c45ceb 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
@@ -280,7 +275,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
@@ -319,7 +314,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
@@ -405,12 +400,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 31d5206c..56a89ee6 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