git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wip github actions CI
[plcapi.git]
/
tests
/
ci
/
setup
/
setup_apache.sh
diff --git
a/tests/ci/setup/setup_apache.sh
b/tests/ci/setup/setup_apache.sh
index
2d34d9b
..
b591729
100755
(executable)
--- a/
tests/ci/setup/setup_apache.sh
+++ b/
tests/ci/setup/setup_apache.sh
@@
-15,14
+15,15
@@
DEBIAN_FRONTEND=noninteractive apt-get install -y apache2
a2enmod rewrite proxy_fcgi setenvif ssl
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)
+# @todo silence errors in a smarter way
+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
# 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
echo "export TESTS_ROOT_DIR=$(pwd)" >> /etc/apache2/envvars
else
echo "export TESTS_ROOT_DIR=/var/www/html" >> /etc/apache2/envvars