X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fci%2Fsetup%2Fsetup_apache.sh;h=b7ac4e8097e19fcf711f4fe37d69e40f7f315578;hb=76321b4eac8def8ccae28a467752ec30d637cf97;hp=2d34d9bf3db251bb8bd3cceee4e0bbba8c8048ff;hpb=d867a3b3e5632755b143b1010cdda17466d21df1;p=plcapi.git

diff --git a/tests/ci/setup/setup_apache.sh b/tests/ci/setup/setup_apache.sh
index 2d34d9b..b7ac4e8 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