wip github actions CI

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 021d7db..7a804b6 100644 (file)
--- 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 && sudo ./tests/ci/setup/setup_php_github.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' }}

diff --git a/tests/ci/setup/setup_php_github.sh b/tests/ci/setup/setup_php_github.sh
deleted file mode 100644 (file)
index f82acb2..0000000
--- a/tests/ci/setup/setup_php_github.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-# Has to be run as admin
-
-# To be kept in sync with setup_php_travis.sh
-
-# @todo make it optional to disable xdebug ?
-
-set -e
-
-configure_php_ini() {
-    # note: these settings are not required for cli config
-    echo "cgi.fix_pathinfo = 1" >> "${1}"
-    echo "always_populate_raw_post_data = -1" >> "${1}"
-
-    # we disable xdebug for speed for both cli and web mode
-    phpdismod xdebug
-}
-
-PHPVER=$(php -r 'echo implode(".",array_slice(explode(".",PHP_VERSION),0,2));' 2>/dev/null)
-
-# this is done via shivammathur/setup-php
-#configure_php_ini /etc/php/${PHPVER}/fpm/php.ini
-
-# install php-fpm
-apt-get install php$PHPVER-fpm
-cp /usr/sbin/php-fpm$PHPVER /usr/bin/php-fpm # copy to /usr/bin
-
-# use a nice name for the php-fpm service, so that it does not depend on php version running
-#service "php${PHPVER}-fpm" stop
-#ln -s "/etc/init.d/php${PHPVER}-fpm" /etc/init.d/php-fpm
-
-# @todo shall we configure php-fpm?
-
-service php$PHPVER-fpm start
-service php$PHPVER-fpm status
-
-# configure apache
-a2enconf php${PHPVER}-fpm
-service apache2 restart