From: Joe Orton <jorton@apache.org>
Date: Thu, 12 Dec 2024 17:54:24 +0000 (+0000)
Subject: Merge r1921310, r1922412 from trunk: [CTR for CI changes]
X-Git-Tag: 2.4.63-candidate~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=945e3ca74abfbb6f467cb11a7a45f3731b9ac30d;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1921310, r1922412 from trunk: [CTR for CI changes]

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

CI: Switch down to GCC 12, the ubuntu-latest image is not consistently
an Ubuntu 24.04 environment yet, this version should be available in
both the -22.04 and -24.04 images.

Github: closes #498



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1922457 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 592002ca99f..8f811382f12 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 12 maintainer-mode w/-Werror, install + VPATH
             config: --enable-mods-shared=reallyall --enable-maintainer-mode
             notest-cflags: -Werror -O2
             env: |
-              CC=gcc-10
+              CC=gcc-12
               TEST_VPATH=1
               TEST_INSTALL=1
               SKIP_TESTING=1
@@ -292,5 +292,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