Merge pull request #956 from libexpat/get-off-of-ubuntu-20-04

Get CI off of about-to-be-removed Ubuntu 20.04

.github/workflows/autotools-cmake.yml

@@ -50,10 +50,10 @@ jobs:
           - os: macos-14
             configure_args:
             cmake_args:
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             configure_args:
             cmake_args:
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             configure_args: --host=i686-w64-mingw32
             cmake_args: -DCMAKE_TOOLCHAIN_FILE=cmake/mingw-toolchain.cmake
     defaults:

.github/workflows/cmake-required-version.yml

@@ -44,7 +44,7 @@ permissions:
 jobs:
   checks:
     name: Ensure realistic minimum CMake version requirement
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
 

.github/workflows/data/expat_config_h_in__expected.txt

@@ -11,9 +11,9 @@ HAVE_GETPAGESIZE
 HAVE_GETRANDOM
 HAVE_INTTYPES_H
 HAVE_LIBBSD
-HAVE_MEMORY_H
 HAVE_MMAP
 HAVE_STDINT_H
+HAVE_STDIO_H
 HAVE_STDLIB_H
 HAVE_STRING_H
 HAVE_STRINGS_H

.github/workflows/expat_config_h.yml

@@ -43,7 +43,7 @@ permissions:
 jobs:
   checks:
     name: Check expat_config.h.{in,cmake} for regressions
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
     - name: Check expat_config.h.{in,cmake} for regressions

.github/workflows/linux.yml

@@ -82,7 +82,7 @@ jobs:
             FLAT_ENV: CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ LD=i686-w64-mingw32-ld QA_PROCESSOR=gcov CMAKE_ARGS="-DCMAKE_SYSTEM_NAME=Windows -DWIN32=ON -DMINGW=ON -DEXPAT_ATTR_INFO=ON"
           - MODE: qa-sh
             FLAT_ENV: CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ LD=i686-w64-mingw32-ld QA_PROCESSOR=gcov CMAKE_ARGS="-DCMAKE_SYSTEM_NAME=Windows -DWIN32=ON -DMINGW=ON -DEXPAT_ATTR_INFO=ON -DEXPAT_CHAR_TYPE=wchar_t"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       CFLAGS: -g3 -pipe
     steps:
@@ -90,20 +90,7 @@ jobs:
     - name: Install build dependencies (MinGW)
       if: "${{ contains(matrix.FLAT_ENV, 'mingw') }}"
       run: |-
-        set -x -u -o pipefail
-        source /etc/os-release
-
-        # Get rid of packages installed from ppa:ondrej/php so that we will be able to install wine32:i386 without conflicts
-        # (see issue https://github.com/actions/virtual-environments/issues/4589)
-        # In detail we:
-        #   1. Remove all packages that ppa:ondrej/php has but plain Ubuntu doesn't, e.g. everything PHP
-        #   2. Revert (remaining) packages that ppa:ondrej/php and plain Ubuntu share, back to the plain Ubuntu version
-        #   3. Assert that no packages from ppa:ondrej/php are left installed
-        dpkg -l | grep '^ii' | grep -F deb.sury.org | awk '{print $2}' | grep '^php' \
-          | xargs -r -t sudo apt-get remove --yes debsuryorg-archive-keyring libpcre2-posix3 libzip4
-        dpkg -l | grep '^ii' | grep -F deb.sury.org | awk '{print $2}' | sed "s,\$,/${UBUNTU_CODENAME}," \
-          | xargs -r -t sudo apt-get install --yes --no-install-recommends --allow-downgrades -V
-        ! dpkg -l | grep '^ii' | grep -F deb.sury.org
+        set -x
 
         # Install 32bit Wine
         sudo dpkg --add-architecture i386  # for wine32

.github/workflows/valid-xml.yml

@@ -43,7 +43,7 @@ permissions:
 jobs:
   checks:
     name: Ensure well-formed and valid XML
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2