Tests with PHP 7.4, 8.0, and 8.1

.github/workflows/ci.yml

@@ -25,6 +25,11 @@ jobs:
                 run: 'pycodestyle --ignore=E501,W605,E722 invoke.py tasks.py'
     ci:
         runs-on: ubuntu-latest
+        strategy:
+            fail-fast: false
+            matrix:
+                php-version: [7.4, 8.0, 8.1]
+        name: Test with PHP ${{ matrix.php-version }}
         steps:
             -
                 uses: actions/checkout@v2
@@ -38,6 +43,9 @@ jobs:
             -
                 run: 'pip3 install pipenv'
 
+            -   name: Set PHP version
+                run: sed -i "s/^php_version = .*/php_version = '${{ matrix.php-version }}'/" invoke.py
+
             # Install the stack and run the tests
 
             -
@@ -65,6 +73,10 @@ jobs:
                     $pdo->exec('CREATE TABLE test (id integer NOT NULL)');
                     $pdo->exec('INSERT INTO test VALUES (1)');
                     echo $pdo->query('SELECT * from test')->fetchAll() ? 'database OK' : 'database KO';
+                    echo "\n" . PHP_VERSION . "\n";
                     EOPHP
 
+                    curl --silent -H "Host: app.test" https://127.0.0.1
+
+                    # Real test
                     curl --fail --insecure --silent -H "Host: app.test" https://127.0.0.1 | grep "database OK"

CHANGELOG.md

@@ -5,6 +5,7 @@
 * Add documentation cookbook for using pg_activity
 * Forward CI env vars in Docker containers
 * Run the npm/yarn/webpack commands on the host for all mac users (even the ones not using Dinghy)
+* Tests with PHP 7.4, 8.0, and 8.1
 
 ## 3.7.0 (2022-05-24)
 

infrastructure/docker/services/builder/Dockerfile

@@ -29,7 +29,7 @@ RUN adduser app sudo \
     && phpenmod app-builder
 
 # Composer
-COPY --from=composer/composer:2.3.5 /usr/bin/composer /usr/bin/composer
+COPY --from=composer/composer:2.3.7 /usr/bin/composer /usr/bin/composer
 RUN mkdir -p "/home/app/.composer/cache" \
     && chown app: /home/app/.composer -R