X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=.github%2Fworkflows%2Fci.yml;h=6771ca4eab0e15e900008dcca0b0a114ae70b4fe;hb=533d1a28e5b22a0508554194d776fbf5b48e0ded;hp=7a804b60889074adbd2c4690c28b621368ba3e0a;hpb=06f68009ebdc123aa242f849d01f5d6cbc043726;p=plcapi.git

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7a804b60..6771ca4e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,8 @@ jobs:
             HTTPSURI: /demo/server/server.php
             PROXYSERVER: localhost:8080
             # Travis currently compiles PHP with an oldish cURL/GnuTLS combination;
-            # to make the tests pass when Apache has a bogus SSL cert whe need the full set of options below
+            # to make the tests pass when Apache has a bogus SSL cert whe need the full set of options below.
+            # @todo check: is this necessary as well on GHA runners?
             HTTPSVERIFYHOST: 0
             HTTPSIGNOREPEER: 1
             SSLVERSION: 0
@@ -41,11 +42,11 @@ jobs:
                 # @todo add config setup scripts for windows
                 run: |
                     chmod 755 ./tests/ci/setup/*.sh
-                    sudo ./tests/ci/setup/setup_perl.sh
-                    sudo ./tests/ci/setup/setup_apache.sh
-                    sudo ./tests/ci/setup/setup_privoxy.sh
-                    sudo ./tests/ci/setup/setup_php.sh ${{ matrix.php }}
-                    sudo ./setup_composer.sh
+                    sudo --preserve-env=GITHUB_ACTIONS ./tests/ci/setup/setup_perl.sh
+                    sudo --preserve-env=GITHUB_ACTIONS ./tests/ci/setup/setup_apache.sh
+                    sudo --preserve-env=GITHUB_ACTIONS ./tests/ci/setup/setup_privoxy.sh
+                    sudo --preserve-env=GITHUB_ACTIONS ./tests/ci/setup/setup_php.sh ${{ matrix.php }}
+                    sudo --preserve-env=GITHUB_ACTIONS ./tests/ci/setup/setup_composer.sh
             # Avoid downloading composer deps on every workflow. Is this useful/working for us?
             #-
             #    uses: actions/cache@v2
@@ -67,14 +68,22 @@ jobs:
             -
                 if: ${{ failure() }}
                 run: |
-                    systemctl status apache2.service
-                    ls -la /etc/apache2/mods-enabled
-                    ls -la /etc/apache2/conf-enabled
-                    ls -la /etc/apache2/mods-available
-                    ls -la /etc/apache2/conf-available
-                    sudo cat /var/log/apache2/error.log
-                    sudo cat /var/log/apache2/other_vhosts_access.log
                     #env
                     #php -i
-                    #sudo cat /var/log/privoxy/*
-                    #sudo cat /var/log/php*.log
+                    #ps auxwww
+                    dpkg --list | grep php
+                    ps auxwww | grep fpm
+                    pwd
+                    sudo env
+                    #systemctl status apache2.service
+                    #ls -la /etc/apache2/mods-enabled
+                    #ls -la /etc/apache2/conf-enabled
+                    #ls -la /etc/apache2/mods-available
+                    #ls -la /etc/apache2/conf-available
+                    #ls -la /etc/apache2/sites-available/
+                    #sudo cat /etc/apache2/envvars
+                    #sudo cat /etc/apache2/sites-available/000-default.conf
+                    sudo cat /var/log/privoxy/*
+                    sudo cat /var/log/apache2/error.log
+                    sudo cat /var/log/apache2/other_vhosts_access.log
+                    sudo cat /var/log/php*.log