diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index bfd770ea10a..01a4310510d 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -22,7 +22,7 @@ env: MARGS: "-j2" CFLAGS: "-g" # This will need updating as the ubuntu-latest image changes: - PHP_FPM: "/usr/sbin/php-fpm8.1" + PHP_FPM: "/usr/sbin/php-fpm8.3" jobs: build: diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh index d35f61cf633..e85590b99b9 100755 --- a/test/travis_before_linux.sh +++ b/test/travis_before_linux.sh @@ -252,3 +252,8 @@ if test -v TEST_MOD_TLS -a -v RUSTLS_VERSION; then popd fi fi + +if test -v PHP_FPM -a ! -v SKIP_TESTING; then + # Sanity test the php-fpm executable exists. + $PHP_FPM --version || exit 1 +fi diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh index 8d74f58d483..67378192a33 100755 --- a/test/travis_run_linux.sh +++ b/test/travis_run_linux.sh @@ -128,11 +128,6 @@ if test -v TEST_ASAN; then export ASAN_OPTIONS="log_path=$PWD/asan.log:detect_leaks=0" fi -if test -v PHP_FPM; then - # Sanity test the executable exists. - $PHP_FPM --version -fi - # Try to keep all potential coredumps from all processes sudo sysctl -w kernel.core_uses_pid=1 2>/dev/null || true # Systemd based systems might process core dumps via systemd-coredump.