From fa6df038460ef83c1d4c43ffa75adfda0ffc0735 Mon Sep 17 00:00:00 2001
From: Gary Jones <gary.jones@automattic.com>
Date: Fri, 26 Apr 2024 14:33:59 +0100
Subject: [PATCH] CI: Update tested versions

Doesn't make sense to test WP versions would unsupported PHP versions (e.g. WP 5.9 with PHP 8.3).
---
 .github/workflows/integrate.yml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
index 87f764e5..e9d7c863 100644
--- a/.github/workflows/integrate.yml
+++ b/.github/workflows/integrate.yml
@@ -13,18 +13,23 @@ jobs:
 
     strategy:
       matrix:
-        wordpress: [ '5.9', '6.5' ]
-        php: [ '7.4', 'latest' ]
-        allowed_failure: [ false ]
         include:
+          # Check lowest supported WP version, with the lowest supported PHP.
+          - wordpress: '5.9'
+            php: '7.4'
+            allowed_failure: false
+          # Check latest WP with the highest supported PHP.
+          - wordpress: 'latest'
+            php: 'latest'
+            allowed_failure: false
           # Check upcoming WP.
-          - php: 'latest'
-            wordpress: 'trunk'
-            allowed_failure: true
-          # Check upcoming PHP.
-          - php: '8.4'
-            wordpress: 'latest'
+          - wordpress: 'trunk'
+            php: 'latest'
             allowed_failure: true
+          # Check upcoming PHP - only needed when a new version has been forked (typically Sep-Nov)
+#          - wordpress: 'trunk'
+#            php: 'nightly'
+#            allowed_failure: true
       fail-fast: false
 
     steps: