From d84dff07856efa2c1ad16e3f629e61e1ddab8dae Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers <359867+desrosj@users.noreply.github.com> Date: Tue, 12 May 2026 15:52:15 -0400 Subject: [PATCH 1/2] Add MySQL 9.7 to the test matrix. --- .github/workflows/phpunit-tests.yml | 12 ++++++------ .version-support-mysql.json | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml index 74dfc220c04a6..8f1341cf866dd 100644 --- a/.github/workflows/phpunit-tests.yml +++ b/.github/workflows/phpunit-tests.yml @@ -76,7 +76,7 @@ jobs: os: [ ubuntu-24.04 ] php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ] db-type: [ 'mysql' ] - db-version: [ '5.7', '8.0', '8.4' ] + db-version: [ '5.7', '8.0', '8.4', '9.7' ] tests-domain: [ 'example.org' ] multisite: [ false, true ] memcached: [ false ] @@ -283,14 +283,14 @@ jobs: fail-fast: false matrix: php: [ '7.4', '8.4' ] - db-version: [ '8.4', '11.8' ] + db-version: [ '9.7', '11.8' ] db-type: [ 'mysql', 'mariadb' ] multisite: [ false ] include: # Include one multisite job for each database type. - php: '8.4' - db-version: '8.4' + db-version: '9.7' db-type: 'mysql' multisite: true - php: '8.4' @@ -299,13 +299,13 @@ jobs: multisite: true # Test with memcached. - php: '8.4' - db-version: '8.4' + db-version: '9.7' db-type: 'mysql' multisite: true memcached: true # Run specific test groups once. - php: '8.4' - db-version: '8.4' + db-version: '9.7' db-type: 'mysql' phpunit-test-groups: 'html-api-html5lib-tests' @@ -314,7 +314,7 @@ jobs: - db-type: 'mysql' db-version: '11.8' - db-type: 'mariadb' - db-version: '8.4' + db-version: '9.7' with: php: ${{ matrix.php }} diff --git a/.version-support-mysql.json b/.version-support-mysql.json index 6e81f2eff0f09..11c79555307c9 100644 --- a/.version-support-mysql.json +++ b/.version-support-mysql.json @@ -1,5 +1,6 @@ { "7-1": [ + "9.7", "9.6", "9.5", "9.4", From 51d02dbf6981dcc6012357dad7ae3761c0d801cc Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers <359867+desrosj@users.noreply.github.com> Date: Fri, 15 May 2026 00:43:23 -0400 Subject: [PATCH 2/2] Remove all 9.x Innovation Releases for WP 7.1. Keep exclusions in place for older branches that may be testing against them based on the JSON support file. --- .github/workflows/install-testing.yml | 5 +++-- .github/workflows/local-docker-environment.yml | 1 + .github/workflows/phpunit-tests.yml | 4 +--- .github/workflows/upgrade-testing.yml | 4 ++-- .version-support-mysql.json | 7 ------- 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/install-testing.yml b/.github/workflows/install-testing.yml index 8da6a84f1caeb..af53ff08fb11b 100644 --- a/.github/workflows/install-testing.yml +++ b/.github/workflows/install-testing.yml @@ -94,11 +94,12 @@ jobs: - db-version: '9.3' - db-version: '9.4' - db-version: '9.5' + - db-version: '9.6' # 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.6' + db-version: '9.7' - php: '7.3' - db-version: '9.6' + db-version: '9.7' services: database: diff --git a/.github/workflows/local-docker-environment.yml b/.github/workflows/local-docker-environment.yml index d42bba623ec64..b786cc2419c03 100644 --- a/.github/workflows/local-docker-environment.yml +++ b/.github/workflows/local-docker-environment.yml @@ -108,6 +108,7 @@ jobs: - db-version: '9.3' - db-version: '9.4' - db-version: '9.5' + - db-version: '9.6' # No PHP 8.5 + Memcached support yet. - php: '8.5' memcached: true diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml index 8f1341cf866dd..f46b419656a44 100644 --- a/.github/workflows/phpunit-tests.yml +++ b/.github/workflows/phpunit-tests.yml @@ -209,15 +209,13 @@ jobs: os: [ ubuntu-24.04 ] php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ] db-type: [ 'mysql', 'mariadb' ] - db-version: [ '9.6', '12.1' ] + db-version: [ '12.1' ] multisite: [ false, true ] memcached: [ false ] db-innovation: [ true ] exclude: # Exclude version combinations that don't exist. - - db-type: 'mariadb' - db-version: '9.6' - db-type: 'mysql' db-version: '12.1' with: diff --git a/.github/workflows/upgrade-testing.yml b/.github/workflows/upgrade-testing.yml index 1e54a946c03eb..088f334b0a555 100644 --- a/.github/workflows/upgrade-testing.yml +++ b/.github/workflows/upgrade-testing.yml @@ -70,7 +70,7 @@ jobs: os: [ 'ubuntu-24.04' ] php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ] db-type: [ 'mysql' ] - db-version: [ '5.7', '8.0', '8.4', '9.6' ] + db-version: [ '5.7', '8.0', '8.4', '9.7' ] wp: [ '6.8', '6.9', '7.0-RC3' ] multisite: [ false, true ] with: @@ -179,7 +179,7 @@ jobs: os: [ 'ubuntu-24.04' ] php: [ '7.4' ] db-type: [ 'mysql' ] - db-version: [ '5.7', '8.0', '8.4', '9.6' ] + db-version: [ '5.7', '8.0', '8.4', '9.7' ] wp: [ '4.7' ] multisite: [ false, true ] with: diff --git a/.version-support-mysql.json b/.version-support-mysql.json index 11c79555307c9..7ab8aa38df392 100644 --- a/.version-support-mysql.json +++ b/.version-support-mysql.json @@ -1,13 +1,6 @@ { "7-1": [ "9.7", - "9.6", - "9.5", - "9.4", - "9.3", - "9.2", - "9.1", - "9.0", "8.4", "8.0", "5.7",