Skip to content

Commit fcaaccc

Browse files
committed
CI: Try setting PHP_FPM dynamically to restore php-fpm testing.
1 parent 6034b5b commit fcaaccc

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

.github/workflows/linux.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ on:
2121
env:
2222
MARGS: "-j2"
2323
CFLAGS: "-g"
24-
# This will need updating as the ubuntu-latest image changes:
25-
PHP_FPM: "/usr/sbin/php-fpm8.1"
2624

2725
jobs:
2826
build:

test/travis_run_linux.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,13 @@ if ! test -v NO_TEST_FRAMEWORK; then
146146
RV=1
147147
fi
148148

149+
PHP_FPM="`echo /usr/bin/php*-fpm || true`"
150+
if test -x $PHP_FPM; then
151+
: Using php-fpm at $PHP_FPM
152+
else
153+
unset PHP_FPM
154+
fi
155+
149156
if test -v WITH_TEST_SUITE -a $RV -eq 0; then
150157
make check TESTS="${TESTS}" TEST_CONFIG="${TEST_ARGS}" | tee test.log
151158
RV=${PIPESTATUS[0]}

0 commit comments

Comments
 (0)