From: Joe Orton <jorton@apache.org>
Date: Mon, 17 Jun 2024 08:20:54 +0000 (+0000)
Subject: Merge r1918150 from trunk: [CTR for CI changes]
X-Git-Tag: 2.4.60-rc1-candidate~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0aa7f148f7a38429f6036628c6ccb04c860adab7;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1918150 from trunk: [CTR for CI changes]

CI: Set the path to php-fpm so it's found by proxy_fcgi.t (after r1918149).



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

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 991236838ff..1a883c8c23c 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -21,6 +21,8 @@ on:
 env:
   MARGS: "-j2"
   CFLAGS: "-g"
+  # This will need updating as the ubuntu-latest image changes:
+  PHP_FPM: "/usr/sbin/php-fpm8.1"
 
 jobs:
   build: