git://git.onelab.eu / plcapi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bf9efa3)
wip github actions CI
authorgggeek <giunta.gaetano@gmail.com>
Mon, 6 Dec 2021 16:37:33 +0000 (16:37 +0000)
committergggeek <giunta.gaetano@gmail.com>
Mon, 6 Dec 2021 16:37:33 +0000 (16:37 +0000)
tests/ci/setup/setup_apache.sh patch | blob | history

diff --git a/tests/ci/setup/setup_apache.sh b/tests/ci/setup/setup_apache.sh
index 7a6f3af..2d34d9b 100755 (executable)
--- a/tests/ci/setup/setup_apache.sh
+++ b/tests/ci/setup/setup_apache.sh
@@ -15,8 +15,8 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y apache2
 
 a2enmod rewrite proxy_fcgi setenvif ssl
 
-# in case mod-php was enabled
-a2dismod php
+# in case mod-php was enabled (this is the case on github's ubuntu with php 5.x at least)
+a2dismod php || true
 
 # configure apache virtual hosts
 
plcapi