From d72dfee6597fe415741b2e7652ec83aad211567b Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 4 Jan 2024 09:22:26 +0100
Subject: [PATCH] GH Actions: update the matrix for latest WP/PHP

This commit:
* Adds a proper set of builds against PHP 8.1, 8.2 and PHP 8.3 against low/high WP versions supported for those PHP versions as those PHP versions have been released and should be supported.
* Removes the "experimental" builds against PHP 8.1 and 8.2 as those PHP versions have been released and should be supported.
* Moves the builds against PHP 5.6 from the "complementary" builds section to the "PHP version support" section.
* Moves some comments around to make it more straight forward to understand how this matrix should be read and updated.

I've verified that all (nearly) WP versions between the lowest and the highest supported version now have at least one build.
---
 .github/workflows/test.yml | 46 +++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index be73927..99a4016 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,32 +24,54 @@ jobs:
         experimental: [false]
 
         include:
-          # Complement the builds run via the matrix with high/low WP builds for PHP 7.4 and 8.0.
-          # PHP 8.0 is sort of supported since WP 5.6.
-          # PHP 7.4 is supported since WP 5.3.
+          # Complement the builds run via the matrix with high/low WP builds for PHP 5.6 and PHP 7.4 up to 8.3.
+          # PHP 8.3 is beta-supported since WP 6.4.
+          - php: '8.3'
+            wp: 'latest'
+            experimental: false
+          - php: '8.3'
+            wp: '6.4'
+            experimental: false
+          # PHP 8.2 is beta-supported since WP 6.1.
+          - php: '8.2'
+            wp: 'latest'
+            experimental: false
+          - php: '8.2'
+            wp: '6.1'
+            experimental: false
+          # PHP 8.1 is beta-supported since WP 5.9 (with the exception of Requests, which was updated in WP 6.2).
+          - php: '8.1'
+            wp: 'latest'
+            experimental: false
+          - php: '8.1'
+            wp: '5.9'
+            experimental: false
+          # PHP 8.0 is beta-supported since WP 5.6.
           - php: '8.0'
             wp: 'latest'
             experimental: false
           - php: '8.0'
             wp: '5.6'
             experimental: false
+          # PHP 7.4 is supported since WP 5.3.
           - php: '7.4'
             wp: 'latest'
             experimental: false
           - php: '7.4'
             wp: '5.4'
             experimental: false
-
-          # Complement the builds run via the matrix with some additional builds against specific WP versions.
-          - php: '7.3'
-            wp: '5.3'
-            experimental: false
+          # PHP 5.6 was supported up to WP 6.2.
           - php: '5.6'
-            wp: '5.5'
+            wp: '6.2'
             experimental: false
           - php: '5.6'
             wp: '5.2'
             experimental: false
+
+          # Complement the builds run via the matrix with some additional builds against specific WP versions.
+          - php: '7.3'
+            wp: '6.0'
+            experimental: false
           - php: '7.2'
             wp: '5.7'
             experimental: false
@@ -61,12 +83,6 @@ jobs:
             experimental: false
 
           # Experimental builds. These are allowed to fail.
-          - php: '8.1'
-            wp: 'trunk'
-            experimental: true
-          - php: '8.2'
-            wp: 'trunk'
-            experimental: true
           - php: '7.4'
             wp: 'trunk'
             experimental: true