From 9afb55f9c67abe9909d6a0c0e4643f501518b834 Mon Sep 17 00:00:00 2001
From: Christian Sciberras <christian@sciberras.me>
Date: Sun, 3 Nov 2024 12:11:05 +0100
Subject: [PATCH] Optimize build matrix (#41)

* Optimize builds

* Use defaults

* Try with separate step as per GH docs

* Upgrade upload-artifact action

* Remove redundant code
---
 .github/workflows/ci.yml | 53 ++++++++++++++++++++++++++++++++++------
 1 file changed, 46 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 363b3bf..c13499a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,6 +10,20 @@ defaults:
     shell: bash
 
 jobs:
+  defaults:
+    name: Set up defaults
+    runs-on: ubuntu-latest
+    outputs:
+      php: ${{ steps.defaults.outputs.php }}
+      browser: ${{ steps.defaults.outputs.browser }}
+      selenium: ${{ steps.defaults.outputs.selenium }}
+    steps:
+      - id: defaults
+        run: |
+          echo 'php="8.3"' >> "$GITHUB_OUTPUT"
+          echo 'browser="chrome"' >> "$GITHUB_OUTPUT"
+          echo 'selenium="4"' >> "$GITHUB_OUTPUT"
+
   check_composer:
     name: Check composer.json
     runs-on: ubuntu-latest
@@ -37,18 +51,43 @@ jobs:
   tests:
     name: Tests
     runs-on: ubuntu-latest
+    needs: defaults
     strategy:
       matrix:
-        php: [ '7.4', '8.0', '8.1', '8.2' ]
-        browser: [ 'firefox', 'chrome' ]
-        selenium: [ '2.53.1', '3', '4' ]
+        # Check different Selenium versions for common browsers
+        php:
+          - ${{ fromJSON(needs.defaults.outputs.php) }}
+        browser:
+          - 'firefox'
+          - 'chrome'
+        selenium:
+          - '2.53.1'
+          - '3'
+          - '4'
         include:
+          # Check on different PHP versions
           - php: '7.4'
-            browser: 'edge'
-            selenium: '4'
+            browser: ${{ fromJSON(needs.defaults.outputs.browser) }}
+            selenium: ${{ fromJSON(needs.defaults.outputs.selenium) }}
+          - php: '8.0'
+            browser: ${{ fromJSON(needs.defaults.outputs.browser) }}
+            selenium: ${{ fromJSON(needs.defaults.outputs.selenium) }}
+          - php: '8.1'
+            browser: ${{ fromJSON(needs.defaults.outputs.browser) }}
+            selenium: ${{ fromJSON(needs.defaults.outputs.selenium) }}
           - php: '8.2'
+            browser: ${{ fromJSON(needs.defaults.outputs.browser) }}
+            selenium: ${{ fromJSON(needs.defaults.outputs.selenium) }}
+          - php: '8.3'
+            browser: ${{ fromJSON(needs.defaults.outputs.browser) }}
+            selenium: ${{ fromJSON(needs.defaults.outputs.selenium) }}
+          # Check less-common browsers
+          - php: ${{ fromJSON(needs.defaults.outputs.php) }}
+            browser: 'edge'
+            selenium: ${{ fromJSON(needs.defaults.outputs.selenium) }}
+          - php: ${{ fromJSON(needs.defaults.outputs.php) }}
             browser: 'chromium'
-            selenium: '4'
+            selenium: ${{ fromJSON(needs.defaults.outputs.selenium) }}
       fail-fast: false
 
     steps:
@@ -99,7 +138,7 @@ jobs:
           docker compose logs --no-color &> ./logs/selenium.log
 
       - name: Archive logs artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
           name: logs_php-${{ matrix.php }}_selenium-${{ matrix.selenium }}_${{ matrix.browser }}