From 1df28a8344ef6da2fd03bc5cbb3a0224e75ff018 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Wed, 4 Jun 2025 14:34:17 +0200 Subject: [PATCH 1/4] Test against latest innovation release. --- .github/workflows/install-testing.yml | 4 ++-- .github/workflows/local-docker-environment.yml | 6 ++++-- .github/workflows/phpunit-tests.yml | 8 ++++---- .github/workflows/upgrade-testing.yml | 12 ++++++------ .version-support-mysql.json | 2 ++ 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/install-testing.yml b/.github/workflows/install-testing.yml index 775ea83c753f9..e2772cbfec52c 100644 --- a/.github/workflows/install-testing.yml +++ b/.github/workflows/install-testing.yml @@ -94,9 +94,9 @@ jobs: - db-version: '9.0' # 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.1' + db-version: '9.3' - php: '7.3' - db-version: '9.1' + db-version: '9.3' services: database: diff --git a/.github/workflows/local-docker-environment.yml b/.github/workflows/local-docker-environment.yml index 7e4be73c33648..d8312015f621c 100644 --- a/.github/workflows/local-docker-environment.yml +++ b/.github/workflows/local-docker-environment.yml @@ -97,11 +97,13 @@ jobs: - db-version: '5.5' # Only test the latest innovation release. - db-version: '9.0' + - db-version: '9.1' + - 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.1' + db-version: '9.3' - php: '7.3' - db-version: '9.1' + db-version: '9.3' with: os: ${{ matrix.os }} diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml index 2feb89a063879..8312d079610bc 100644 --- a/.github/workflows/phpunit-tests.yml +++ b/.github/workflows/phpunit-tests.yml @@ -187,7 +187,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', 'mariadb' ] - db-version: [ '9.1', '11.6' ] + db-version: [ '9.3', '11.6' ] multisite: [ false, true ] memcached: [ false ] db-innovation: [ true ] @@ -195,12 +195,12 @@ 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.1' + db-version: '9.3' - php: '7.3' - db-version: '9.1' + db-version: '9.3' # Exclude version combinations that don't exist. - db-type: 'mariadb' - db-version: '9.1' + db-version: '9.3' - db-type: 'mysql' db-version: '11.6' with: diff --git a/.github/workflows/upgrade-testing.yml b/.github/workflows/upgrade-testing.yml index 8f3320f216b0c..39846ce6b0000 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.1' ] + db-version: [ '5.7', '8.0', '8.4', '9.3' ] wp: [ '6.6', '6.7' ] 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.1' + db-version: '9.3' - php: '7.3' - db-version: '9.1' + db-version: '9.3' with: os: ${{ matrix.os }} php: ${{ matrix.php }} @@ -243,7 +243,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.1' ] + db-version: [ '5.7', '8.0', '8.4', '9.3' ] wp: [ '4.1' ] multisite: [ false, true ] @@ -255,9 +255,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.1' + db-version: '9.3' - php: '7.3' - db-version: '9.1' + db-version: '9.3' with: os: ${{ matrix.os }} php: ${{ matrix.php }} diff --git a/.version-support-mysql.json b/.version-support-mysql.json index bc3d17dce654c..e92216e4164dc 100644 --- a/.version-support-mysql.json +++ b/.version-support-mysql.json @@ -1,5 +1,7 @@ { "6-9": [ + "9.3", + "9.2", "9.1", "9.0", "8.4", From b44e497461ed3bcffaa02529eb50bf468380fa60 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Wed, 4 Jun 2025 14:36:55 +0200 Subject: [PATCH 2/4] Latest stable rolling release of MariaDB is 11.7. --- .github/workflows/phpunit-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml index 8312d079610bc..83054d8b86233 100644 --- a/.github/workflows/phpunit-tests.yml +++ b/.github/workflows/phpunit-tests.yml @@ -187,7 +187,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', 'mariadb' ] - db-version: [ '9.3', '11.6' ] + db-version: [ '9.3', '11.7' ] multisite: [ false, true ] memcached: [ false ] db-innovation: [ true ] @@ -202,7 +202,7 @@ jobs: - db-type: 'mariadb' db-version: '9.3' - db-type: 'mysql' - db-version: '11.6' + db-version: '11.7' with: os: ${{ matrix.os }} php: ${{ matrix.php }} From 4a35b2c93eb16da612ef8ad0e319a18d6064caee Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Wed, 4 Jun 2025 14:48:48 +0200 Subject: [PATCH 3/4] Add old innovation releases to exclusion list. --- .github/workflows/install-testing.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/install-testing.yml b/.github/workflows/install-testing.yml index e2772cbfec52c..6d6caf246a347 100644 --- a/.github/workflows/install-testing.yml +++ b/.github/workflows/install-testing.yml @@ -92,6 +92,8 @@ jobs: db-version: '8.4' # Only test the latest innovation release. - db-version: '9.0' + - db-version: '9.1' + - 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' From 5c44ba151c61f593e662d54cfa7377f063a173a0 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Thu, 5 Jun 2025 09:34:55 +0200 Subject: [PATCH 4/4] MariaDB does not have innovation releases. They are rolling releases. --- .github/workflows/reusable-phpunit-tests-v3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-phpunit-tests-v3.yml b/.github/workflows/reusable-phpunit-tests-v3.yml index 81b20d27cec8d..e57b57d486adf 100644 --- a/.github/workflows/reusable-phpunit-tests-v3.yml +++ b/.github/workflows/reusable-phpunit-tests-v3.yml @@ -118,7 +118,7 @@ jobs: # - Checks out the WordPress Test reporter repository. # - Submit the test results to the WordPress.org host test results. phpunit-tests: - name: ${{ inputs.phpunit-test-groups && format( '{0} / ', inputs.phpunit-test-groups ) || '' }}PHP ${{ inputs.php }} ${{ ! inputs.phpunit-test-groups && ! inputs.coverage-report && '/ ' || 'with ' }}${{ 'mariadb' == inputs.db-type && 'MariaDB' || 'MySQL' }} ${{ inputs.db-version }}${{ inputs.multisite && ' multisite' || '' }}${{ inputs.db-innovation && ' (innovation release)' || '' }}${{ inputs.memcached && ' with memcached' || '' }}${{ inputs.report && ' (test reporting enabled)' || '' }} ${{ 'example.org' != inputs.tests-domain && inputs.tests-domain || '' }} + name: ${{ inputs.phpunit-test-groups && format( '{0} / ', inputs.phpunit-test-groups ) || '' }}PHP ${{ inputs.php }} ${{ ! inputs.phpunit-test-groups && ! inputs.coverage-report && '/ ' || 'with ' }}${{ 'mariadb' == inputs.db-type && 'MariaDB' || 'MySQL' }} ${{ inputs.db-version }}${{ inputs.multisite && ' multisite' || '' }}${{ ( inputs.db-innovation && 'mariadb' == inputs.db-type && 'MariaDB' && ' (rolling release)' ) || inputs.db-innovation && ' (innovation release)' || '' }}${{ inputs.memcached && ' with memcached' || '' }}${{ inputs.report && ' (test reporting enabled)' || '' }} ${{ 'example.org' != inputs.tests-domain && inputs.tests-domain || '' }} runs-on: ${{ inputs.os }} timeout-minutes: ${{ inputs.coverage-report && 120 || inputs.php == '8.4' && 30 || 20 }}