From c7e1bdd8f2a65c45da01bc9acc77857ca412212f Mon Sep 17 00:00:00 2001 From: gggeek Date: Mon, 6 Dec 2021 17:10:39 +0000 Subject: [PATCH] wip github actions CI --- tests/ci/setup/setup_apache.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/ci/setup/setup_apache.sh b/tests/ci/setup/setup_apache.sh index 0867ad7..366f59e 100755 --- a/tests/ci/setup/setup_apache.sh +++ b/tests/ci/setup/setup_apache.sh @@ -15,14 +15,14 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y apache2 a2enmod rewrite proxy_fcgi setenvif ssl -# in case mod-php was enabled (this is the case on github's ubuntu with php 5.x at least) -a2dismod php || true +# in case mod-php was enabled (this is the case on at least github's ubuntu with php 5.x and shivammathur/setup-php) +rm /etc/apache2/mods-enabled/php* || true # configure apache virtual hosts cp -f "$SCRIPT_DIR/../config/apache_vhost" /etc/apache2/sites-available/000-default.conf -if [ -n "${TRAVIS}" ]; then +if [ -n "${TRAVIS}" -o -n "${GITHUB_ACTIONS}" ]; then echo "export TESTS_ROOT_DIR=$(pwd)" >> /etc/apache2/envvars else echo "export TESTS_ROOT_DIR=/var/www/html" >> /etc/apache2/envvars -- 2.43.0