From 843a4b244b935d1237d89751cb8464d9f460ac42 Mon Sep 17 00:00:00 2001
From: aledesma-godaddy <aledesma@godaddy.com>
Date: Wed, 13 Aug 2025 09:18:53 -0700
Subject: [PATCH 1/2] update test matrix to support 6.8

---
 .github/workflows/test-e2e.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 185ede7d491..f1938d6945a 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -22,15 +22,15 @@ jobs:
       fail-fast: false
       matrix:
         wp: # Test against Prev-Prev Major, Prev-Major, and current Major release versions.
-          - "6.5"
           - "6.6"
           - "6.7"
+          - "6.8"
         theme:
           - "https://downloads.wordpress.org/theme/go.zip"
           - "" # Default theme is TwentyTwentyThree
         php: # Test against minimum and latest PHP versions.
           - "7.4"
-          - "8.3"
+          - "8.4"
     with:
       wpVersion: "WordPress/WordPress#${{matrix.wp}}"
       theme: ${{matrix.theme}}

From ffcb6b2dfeca9f234ea6e87b5cc6981f4dbc4a1c Mon Sep 17 00:00:00 2001
From: aledesma-godaddy <aledesma@godaddy.com>
Date: Wed, 13 Aug 2025 09:22:29 -0700
Subject: [PATCH 2/2] CI: Update test matrices: drop WP 6.5; add WP 6.8; add
 PHP 8.4

---
 .github/workflows/test-e2e-cypress.yml | 2 +-
 .github/workflows/test-php-unit.yml    | 2 +-
 .github/workflows/test-php.yml         | 4 ++--
 .github/workflows/test-wp-next.yml     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-e2e-cypress.yml b/.github/workflows/test-e2e-cypress.yml
index 699272704f5..65f2b515ebf 100644
--- a/.github/workflows/test-e2e-cypress.yml
+++ b/.github/workflows/test-e2e-cypress.yml
@@ -17,7 +17,7 @@ on:
       phpVersion:
         required: false
         type: string
-        default: "8.3"
+        default: "8.4"
       installPath:
           required: false
           type: string
diff --git a/.github/workflows/test-php-unit.yml b/.github/workflows/test-php-unit.yml
index 475dfe152ae..5c7e4069d34 100644
--- a/.github/workflows/test-php-unit.yml
+++ b/.github/workflows/test-php-unit.yml
@@ -6,7 +6,7 @@ on:
       phpVersion:
         required: false
         type: string
-        default: '8.3'
+        default: '8.4'
       wpVersion:
         required: false
         type: string
diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml
index 6d1fa2698b2..072983e5562 100644
--- a/.github/workflows/test-php.yml
+++ b/.github/workflows/test-php.yml
@@ -11,8 +11,8 @@ jobs:
   php_unit_versions_matrix:
     strategy:
       matrix:
-        php: ['7.4','8.3']
-        wp: ['6.7']
+        php: ['7.4','8.4']
+        wp: ['6.8']
     name: PHP Unit ${{ matrix.php }} | WP Version ${{ matrix.wp }}
     uses: ./.github/workflows/test-php-unit.yml
     with:
diff --git a/.github/workflows/test-wp-next.yml b/.github/workflows/test-wp-next.yml
index bf3186421d1..05d8f4c5f7f 100644
--- a/.github/workflows/test-wp-next.yml
+++ b/.github/workflows/test-wp-next.yml
@@ -47,7 +47,7 @@ jobs:
     name: PHP ${{ matrix.php }} WP Next Version
     strategy:
       matrix:
-        php: ['7.4','8.3']
+        php: ['7.4','8.4']
     uses: ./.github/workflows/test-php-unit.yml
     with:
       phpVersion: ${{ matrix.php }}