From 71dbb83219c6b597239427df96b2d9caf662b631 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Tue, 3 Sep 2024 09:51:36 +0100
Subject: [PATCH] Use a matrix for Ubuntu x APR versions testing.

---
 .github/workflows/linux.yml | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 6d6f1eb7..364585cf 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -16,18 +16,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        apr-version: [1.6.x, 1.7.x]
+        os: [ubuntu-20.04, ubuntu-22.04]
         include: 
-          - name: APR 1.7.x
-            apr-version: 1.7.x
-            config-output: APU_HAVE_SDBM
-          - name: APR 1.6.x
-            apr-version: 1.6.x
-            config-output: APU_HAVE_SDBM
           - name: APR 1.7.x maintainer-mode
             apr-version: 1.7.x
             apr-config: --enable-maintainer-mode
             config-output: APU_HAVE_SDBM
             notest-cflags: -Werror
+            os: ubuntu-latest
           - name: APR 1.7.x LDAP + maintainer-mode
             apr-version: 1.7.x
             apr-config: --enable-maintainer-mode
@@ -35,6 +32,7 @@ jobs:
             config: --with-ldap
             notest-cflags: -Werror
             packages: libldap-dev libsasl2-dev
+            os: ubuntu-latest
           - name: APR 1.7.x Databases + maintainer-mode
             apr-version: 1.7.x
             apr-config: --enable-maintainer-mode
@@ -42,13 +40,30 @@ jobs:
             config: --with-dbm=db5 --with-berkeley-db --with-gdbm --with-ndbm
             notest-cflags: -Werror
             packages: libdb5.3-dev
+            os: ubuntu-latest
           - name: APR 1.7.x OpenSSL + maintainer-mode
             apr-version: 1.7.x
             apr-config: --enable-maintainer-mode
             config: --with-crypto=yes --with-openssl=yes
             config-output: APU_HAVE_CRYPTO APU_HAVE_OPENSSL APU_HAVE_SDBM
             notest-cflags: -Werror
-    runs-on: ubuntu-latest
+            os: ubuntu-latest
+          - name: APR 1.7.x Databases + maintainer-mode
+            apr-version: 1.7.x
+            apr-config: --enable-maintainer-mode
+            config-output: APU_HAVE_SDBM
+            config: --with-dbm=db5 --with-berkeley-db --with-gdbm --with-ndbm
+            notest-cflags: -Werror
+            packages: libdb5.3-dev
+            os: ubuntu-latest
+          - name: APR 1.7.x Ubuntu 20
+            apr-version: 1.7.x
+            apr-config: --enable-maintainer-mode
+            config: --with-crypto=yes --with-openssl=yes
+            config-output: APU_HAVE_CRYPTO APU_HAVE_OPENSSL APU_HAVE_SDBM
+            notest-cflags: -Werror
+            os: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     env:
       NOTEST_CFLAGS: ${{ matrix.notest-cflags }}
     name: ${{ matrix.name }}