From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Tue, 7 Feb 2023 22:18:31 +0000 (+0100)
Subject: Ubuntu 18.04 is being removed shortly, update workflows to use 20.04.
X-Git-Tag: 2.1.0-beta1~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f96a7dce50066fb490971d49d2bf826b21f7f8a7;p=thirdparty%2Fzlib-ng.git

Ubuntu 18.04 is being removed shortly, update workflows to use 20.04.
Clang-6.0 is still supported according to Ubuntu package list website.
---

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 4878038ac..1d0eeeb24 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -12,8 +12,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: Ubuntu 18.04 GCC
-            os: ubuntu-18.04
+          - name: Ubuntu 20.04 GCC
+            os: ubuntu-20.04
             compiler: gcc
             cxx-compiler: g++
 
@@ -281,8 +281,8 @@ jobs:
              # Limit parallel test jobs to prevent wine errors
             parallels-jobs: 1
 
-          - name: Ubuntu 18.04 Clang
-            os: ubuntu-18.04
+          - name: Ubuntu 20.04 Clang
+            os: ubuntu-20.04
             compiler: clang-6.0
             cxx-compiler: clang++-6.0
             packages: clang-6.0
diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml
index 7f2a8683b..e0dde6f9b 100644
--- a/.github/workflows/configure.yml
+++ b/.github/workflows/configure.yml
@@ -13,8 +13,8 @@ jobs:
             compiler: gcc
             configure-args: --warn
 
-          - name: Ubuntu 18.04 GCC
-            os: ubuntu-18.04
+          - name: Ubuntu 20.04 GCC
+            os: ubuntu-20.04
             compiler: gcc
             configure-args: --warn