From 64bcfa05c3d84de0189c20f953a48f19631d27c5 Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@users.noreply.github.com>
Date: Thu, 24 Jul 2025 16:13:11 -0400
Subject: [PATCH 1/2] Only test against supported innovation releases.

Version `9.4` of MySQL has been released making it the new and only supported innovation release.

With the release of MariaDB `11.8`, there are no actively supported rolling innovation releases until 12.0 stable is released.
---
 .github/workflows/install-testing.yml          |  5 +++--
 .github/workflows/local-docker-environment.yml |  4 ++--
 .github/workflows/phpunit-tests.yml            | 13 ++++---------
 .github/workflows/upgrade-testing.yml          | 12 ++++++------
 .version-support-mysql.json                    |  1 +
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/install-testing.yml b/.github/workflows/install-testing.yml
index 6d6caf246a347..981d2a18fb148 100644
--- a/.github/workflows/install-testing.yml
+++ b/.github/workflows/install-testing.yml
@@ -94,11 +94,12 @@ jobs:
           - db-version: '9.0'
           - db-version: '9.1'
           - db-version: '9.2'
+          - db-version: '9.3'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.3'
+            db-version: '9.4'
           - php: '7.3'
-            db-version: '9.3'
+            db-version: '9.4'
 
     services:
       database:
diff --git a/.github/workflows/local-docker-environment.yml b/.github/workflows/local-docker-environment.yml
index d8312015f621c..42d5b13ec7907 100644
--- a/.github/workflows/local-docker-environment.yml
+++ b/.github/workflows/local-docker-environment.yml
@@ -101,9 +101,9 @@ jobs:
           - db-version: '9.2'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.3'
+            db-version: '9.4'
           - php: '7.3'
-            db-version: '9.3'
+            db-version: '9.4'
 
     with:
       os: ${{ matrix.os }}
diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
index d266b40fb249b..8a17cf9b7f6d8 100644
--- a/.github/workflows/phpunit-tests.yml
+++ b/.github/workflows/phpunit-tests.yml
@@ -196,8 +196,8 @@ jobs:
       matrix:
         os: [ ubuntu-24.04 ]
         php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
-        db-type: [ 'mysql', 'mariadb' ]
-        db-version: [ '9.3', '11.7' ]
+        db-type: [ 'mysql' ]
+        db-version: [ '9.4' ]
         multisite: [ false, true ]
         memcached: [ false ]
         db-innovation: [ true ]
@@ -205,14 +205,9 @@ jobs:
         exclude:
           # MySQL 9.0+ will not work on PHP <= 7.3 because mysql_native_password was removed. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.3'
+            db-version: '9.4'
           - php: '7.3'
-            db-version: '9.3'
-          # Exclude version combinations that don't exist.
-          - db-type: 'mariadb'
-            db-version: '9.3'
-          - db-type: 'mysql'
-            db-version: '11.7'
+            db-version: '9.4'
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}
diff --git a/.github/workflows/upgrade-testing.yml b/.github/workflows/upgrade-testing.yml
index 9694433b57a44..6090d48eb0ce6 100644
--- a/.github/workflows/upgrade-testing.yml
+++ b/.github/workflows/upgrade-testing.yml
@@ -65,7 +65,7 @@ jobs:
         os: [ 'ubuntu-24.04' ]
         php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
         db-type: [ 'mysql' ]
-        db-version: [ '5.7', '8.0', '8.4', '9.3' ]
+        db-version: [ '5.7', '8.0', '8.4', '9.4' ]
         wp: [ '6.7', '6.8' ]
         multisite: [ false, true ]
 
@@ -77,9 +77,9 @@ jobs:
             db-version: '8.4'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.3'
+            db-version: '9.4'
           - php: '7.3'
-            db-version: '9.3'
+            db-version: '9.4'
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}
@@ -188,7 +188,7 @@ jobs:
         os: [ 'ubuntu-24.04' ]
         php: [ '7.2', '7.3', '7.4' ]
         db-type: [ 'mysql' ]
-        db-version: [ '5.7', '8.0', '8.4', '9.3' ]
+        db-version: [ '5.7', '8.0', '8.4', '9.4' ]
         wp: [ '4.7' ]
         multisite: [ false, true ]
 
@@ -200,9 +200,9 @@ jobs:
             db-version: '8.4'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
-            db-version: '9.3'
+            db-version: '9.4'
           - php: '7.3'
-            db-version: '9.3'
+            db-version: '9.4'
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}
diff --git a/.version-support-mysql.json b/.version-support-mysql.json
index 09731cfef2777..a81bfbd8b27ee 100644
--- a/.version-support-mysql.json
+++ b/.version-support-mysql.json
@@ -1,5 +1,6 @@
 {
 	"6-9": [
+		"9.4",
 		"9.3",
 		"9.2",
 		"9.1",

From 87af21fda9ceed6de3768031d793ed736915d17d Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@users.noreply.github.com>
Date: Thu, 24 Jul 2025 16:21:28 -0400
Subject: [PATCH 2/2] Prevent MySQL `9.3` jobs in local Docker testing.

---
 .github/workflows/local-docker-environment.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/local-docker-environment.yml b/.github/workflows/local-docker-environment.yml
index 42d5b13ec7907..b94c5bb8e5dad 100644
--- a/.github/workflows/local-docker-environment.yml
+++ b/.github/workflows/local-docker-environment.yml
@@ -99,6 +99,7 @@ jobs:
           - db-version: '9.0'
           - db-version: '9.1'
           - db-version: '9.2'
+          - db-version: '9.3'
           # MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
           - php: '7.2'
             db-version: '9.4'