From: Joe Orton <jorton@apache.org>
Date: Mon, 14 Oct 2024 15:18:05 +0000 (+0000)
Subject: CI: Further fixes for ubuntu-latest image updates on GitHub Actions.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82dc9a9e84006eb8521b39313de30db569ed6f9e;p=thirdparty%2Fapache%2Fhttpd.git

CI: Further fixes for ubuntu-latest image updates on GitHub Actions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1921310 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 588be443d56..d12361c05b2 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -67,11 +67,11 @@ jobs:
             env: |
               TEST_ARGS=-order=random
           # -------------------------------------------------------------------------
-          - name: GCC 10 maintainer-mode w/-Werror, install + VPATH
+          - name: GCC 14 maintainer-mode w/-Werror, install + VPATH
             config: --enable-mods-shared=reallyall --enable-maintainer-mode
             notest-cflags: -Werror -O2
             env: |
-              CC=gcc-10
+              CC=gcc-14
               TEST_VPATH=1
               TEST_INSTALL=1
               SKIP_TESTING=1
@@ -279,6 +279,7 @@ jobs:
               APR_VERSION=1.7.4
               APU_VERSION=1.6.3
               APU_CONFIG="--without-crypto"
+            pkgs: subversion
           # -------------------------------------------------------------------------
           - name: OpenSSL 3.2 -Werror
             config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto
@@ -288,6 +289,7 @@ jobs:
               APR_VERSION=1.7.4
               APU_VERSION=1.6.3
               APU_CONFIG="--without-crypto"
+            pkgs: subversion
           # -------------------------------------------------------------------------
           - name: OpenSSL 3.2 no-engine
             config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto
@@ -297,6 +299,7 @@ jobs:
               APR_VERSION=1.7.4
               APU_VERSION=1.6.3
               APU_CONFIG="--without-crypto"
+            pkgs: subversion
           # -------------------------------------------------------------------------
           - name: OpenSSL 3.3 no-engine -Werror
             config: --enable-mods-shared=most --enable-maintainer-mode --disable-md --disable-http2 --disable-ldap --disable-crypto
@@ -307,6 +310,7 @@ jobs:
               APR_VERSION=1.7.4
               APU_VERSION=1.6.3
               APU_CONFIG="--without-crypto"
+            pkgs: subversion
           # -------------------------------------------------------------------------
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -356,5 +360,6 @@ jobs:
       if: failure()
       with:
         name: error_log-${{ env.JOBID }}
-        path: test/perl-framework/t/logs/error_log
-
+        path: |
+          **/config.log
+          test/perl-framework/t/logs/error_log