Skip to content

Commit 688b98e

Browse files
committed
CI: Fail early if PHP_FPM is set but not valid.
CI: Set PHP_FPM correctly for current Ubuntu images. Github: closes #633 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933654 13f79535-47bb-0310-9956-ffa450edef68
1 parent 237a6d8 commit 688b98e

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

‎.github/workflows/linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ env:
2222
MARGS: "-j2"
2323
CFLAGS: "-g"
2424
# This will need updating as the ubuntu-latest image changes:
25-
PHP_FPM: "/usr/sbin/php-fpm8.1"
25+
PHP_FPM: "/usr/sbin/php-fpm8.3"
2626

2727
jobs:
2828
build:

‎test/travis_before_linux.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,3 +252,8 @@ if test -v TEST_MOD_TLS -a -v RUSTLS_VERSION; then
252252
popd
253253
fi
254254
fi
255+
256+
if test -v PHP_FPM -a ! -v SKIP_TESTING; then
257+
# Sanity test the php-fpm executable exists.
258+
$PHP_FPM --version || exit 1
259+
fi

‎test/travis_run_linux.sh‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,6 @@ if test -v TEST_ASAN; then
128128
export ASAN_OPTIONS="log_path=$PWD/asan.log:detect_leaks=0"
129129
fi
130130

131-
if test -v PHP_FPM; then
132-
# Sanity test the executable exists.
133-
$PHP_FPM --version
134-
fi
135-
136131
# Try to keep all potential coredumps from all processes
137132
sudo sysctl -w kernel.core_uses_pid=1 2>/dev/null || true
138133
# Systemd based systems might process core dumps via systemd-coredump.

0 commit comments

Comments
 (0)