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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c5be4b3..7a804b6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,31 +24,35 @@ jobs:
                 # @todo use an older version of phpunit to enable testing on php 5.3 - 5.5
                 php: ['8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6']
         steps:
-            -
-                uses: shivammathur/setup-php@v2
-                with:
-                    php-version: ${{ matrix.php }}
-                    extensions: curl, dom, mbstring, xsl
-                    ini_values: 'cgi.fix_pathinfo=1, always_populate_raw_post_data=-1'
-                    #tools: phpunit/phpunit:a_version_compatible_with_php_5.3-5.5
-                    # NB: this disables xdebug completely
-                    coverage: none
-            #-
-            #    run: 'php -v && env'
             -
                 uses: actions/checkout@v2
+            # Although this action is useful, we prefer to use the same script to set up php that we use for the
+            # docker image used for local testing. This allows us to make sure that script is always in good shape
+            #-
+            #    uses: shivammathur/setup-php@v2
+            #    with:
+            #        php-version: ${{ matrix.php }}
+            #        extensions: curl, dom, mbstring, xsl
+            #        ini-values: 'cgi.fix_pathinfo=1, always_populate_raw_post_data=-1'
+            #        #tools: phpunit/phpunit:a_version_compatible_with_php_5.3-5.5
+            #        # NB: this disables xdebug completely
+            #        coverage: none
             -
                 # @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'
-            # Avoid downloading composer deps on every workflow. Is this useful for us?
+                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
+            # Avoid downloading composer deps on every workflow. Is this useful/working for us?
             #-
             #    uses: actions/cache@v2
             #    with:
             #        path: /tmp/composer-cache
             #        key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
             -
-                # simpler alternative ? Atm, php-actions/composer also fails because of missing php xsl extension!
-                #uses: php-actions/composer@v6
                 run: 'composer install'
             -
                 if: ${{ matrix.php == '7.4' }}
@@ -61,6 +65,16 @@ jobs:
             -
                 run: 'perl demo/client/perl/test.pl'
             -
-              if: ${{ failure() }}
-              run: 'systemctl status apache2.service; ls -la /etc/apache2/mods-enabled; ls -la /etc/apache2/conf-enabled; sudo cat /var/log/apache2/error.log; sudo cat /var/log/apache2/other_vhosts_access.log'
-              #run: 'env; php -i; sudo cat /var/log/privoxy/*; sudo cat /var/log/php*.log'
+                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