Skip to content

CI: Try setting PHP_FPM dynamically to restore php-fpm testing. #633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
notroj wants to merge 1 commit into
base: trunk
Choose a base branch
from
+7 −2
Open

CI: Try setting PHP_FPM dynamically to restore php-fpm testing. #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions test/travis_run_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]}
Expand Down
Loading