diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 5da65e26d9e..8123be8d65a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -21,8 +21,6 @@ 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: diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh index 8d74f58d483..c932652c58b 100755 --- a/test/travis_run_linux.sh +++ b/test/travis_run_linux.sh @@ -146,6 +146,13 @@ if ! test -v NO_TEST_FRAMEWORK; then RV=1 fi + PHP_FPM="`echo /usr/bin/php*-fpm || true`" + if test -x $PHP_FPM; then + : Using php-fpm at $PHP_FPM + else + unset PHP_FPM + fi + if test -v WITH_TEST_SUITE -a $RV -eq 0; then make check TESTS="${TESTS}" TEST_CONFIG="${TEST_ARGS}" | tee test.log RV=${PIPESTATUS[0]}