From c5854380ac66705fa0e42e689cfc078d79a43ade Mon Sep 17 00:00:00 2001 From: gggeek Date: Thu, 3 Mar 2022 22:27:58 +0000 Subject: [PATCH] build on PRs; nitpicks --- .github/workflows/ci.yml | 2 +- tests/ci/setup/setup_php.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93b5ff7..5d1f245 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,6 @@ name: CI -on: [push] +on: [push, pull_request] jobs: test: diff --git a/tests/ci/setup/setup_php.sh b/tests/ci/setup/setup_php.sh index 03bf0be..038de3d 100755 --- a/tests/ci/setup/setup_php.sh +++ b/tests/ci/setup/setup_php.sh @@ -3,6 +3,7 @@ # Has to be run as admin # @todo make it optional to install xdebug. It is fe. missing in sury's ppa for Xenial +# @todo make it optional to install fpm. It is not needed for the cd workflow # @todo make it optional to disable xdebug ? set -e @@ -80,6 +81,8 @@ fi service php-fpm start -# configure apache -a2enconf php${PHPVER}-fpm -service apache2 restart +# configure apache (if installed) +if [ -n "$(dpkg --list | grep apache)" ]; then + a2enconf php${PHPVER}-fpm + service apache2 restart +fi -- 2.43.0