From efca0c23c2ee7a4a35bb2614ce899927fca95fe6 Mon Sep 17 00:00:00 2001
From: "Oliver G. Mueller" <oliver@teqneers.de>
Date: Mon, 18 Mar 2024 14:40:39 +0100
Subject: [PATCH] fixed matrix run

---
 .github/workflows/ci.yml | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 19d4901..277beeb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,25 +21,25 @@ jobs:
       max-parallel: 2
       fail-fast: false
       matrix:
-        php:
-          - version: "8.1"
-            experimental: false
-          - version: "8.2"
-            experimental: false
-          - version: "8.3"
-            experimental: false
-          - version: "8.4"
-            experimental: true
+        php-version: [
+          "8.1",
+          "8.2",
+          "8.3",
         ]
         composer-param: [
           "update --no-progress --prefer-dist --prefer-lowest",
           "update --no-progress --prefer-dist"
         ]
-    name: "PHP ${{ matrix.php.version }} test"
+        experimental: [false]
+        include:
+          # also try a future version
+          - php-version: "8.4"
+            experimental: true
+    name: "PHP ${{ matrix.php-version }} test"
     steps:
-      - name: "Check if PHP ${{ matrix.php.version }} is supported"
-        if: "matrix.experimental == true"
-        run: "echo 'PHP ${{ matrix.php.version }} is experimental'"
+      - name: "Check if PHP ${{ matrix.php-version }} is supported"
+        if: "matrix.experimental == 'true'"
+        run: "echo 'PHP ${{ matrix.php-version }} is experimental'"
       - name: "checkout project"
         uses: "actions/checkout@v4"
         with:
@@ -49,7 +49,7 @@ jobs:
       - name: "Setup PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "${{ matrix.php.version }}"
+          php-version: "${{ matrix.php-version }}"
           extensions: "bcmath"
           tools: "composer:v2"
           # needed by PHPUnit code coverage
@@ -57,12 +57,12 @@ jobs:
 
       - name: "Validate composer.json and composer.lock"
         run: "composer validate"
-        continue-on-error: "${{ matrix.php.experimental }}"
+        continue-on-error: "${{ matrix.experimental }}"
 
       - name: "Get composer cache directory"
         id: "composer-cache"
         run: "echo \"dir=$(composer config cache-dir)\" >> $GITHUB_OUTPUT"
-        continue-on-error: "${{ matrix.php.experimental }}"
+        continue-on-error: "${{ matrix.experimental }}"
 
       - name: "Cache composer dependencies"
         uses: "actions/cache@v4"
@@ -70,7 +70,7 @@ jobs:
           path: "${{ steps.composer-cache.outputs.dir }}"
           key: "${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}"
           restore-keys: "${{ runner.os }}-composer-"
-        continue-on-error: "${{ matrix.php.experimental }}"
+        continue-on-error: "${{ matrix.experimental }}"
 
       - name: "Install dependencies"
         run: "composer ${{ matrix.composer-param }}"
@@ -79,12 +79,12 @@ jobs:
       # Run phpunit with code coverage
       - name: "PHPUnit Tests"
         run: "vendor/bin/phpunit --coverage-clover=coverage.clover"
-        continue-on-error: "${{ matrix.php.experimental }}"
+        continue-on-error: "${{ matrix.experimental }}"
 
         # Uploading reports for analysis
       - name: "Upload code-coverage to scrutinizer"
         run: "vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover"
-        continue-on-error: "${{ matrix.php.experimental }}"
+        continue-on-error: "${{ matrix.experimental }}"
 
       - name: "Publish code coverage to Code Climate"
         uses: "paambaati/codeclimate-action@v5"
@@ -94,6 +94,6 @@ jobs:
           coverageCommand: "vendor/bin/phpunit --coverage-clover=coverage.clover"
           coverageLocations: |
             coverage.clover:clover
-        continue-on-error: "${{ matrix.php.experimental }}"
+        continue-on-error: "${{ matrix.experimental }}"
 
 # vim: syntax=yaml ts=2 sw=2 et sr softtabstop=2 autoindent