From 84b30e88b79afa07fef2f1ef93444e6e7ab5ada5 Mon Sep 17 00:00:00 2001 From: Aaron Jorbin <622599+aaronjorbin@users.noreply.github.com> Date: Fri, 3 Oct 2025 13:49:20 +0200 Subject: [PATCH 1/4] add new mariadb innovation release --- .github/workflows/phpunit-tests.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml index ccd52008928a2..27b58119548bd 100644 --- a/.github/workflows/phpunit-tests.yml +++ b/.github/workflows/phpunit-tests.yml @@ -202,8 +202,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' ] - db-version: [ '9.4' ] + db-type: [ 'mysql', 'mariadb' ] + db-version: [ '9.4', '12.0.2' ] multisite: [ false, true ] memcached: [ false ] db-innovation: [ true ] @@ -214,6 +214,11 @@ jobs: db-version: '9.4' - php: '7.3' db-version: '9.4' + # Exclude version combinations that don't exist. + - db-type: 'mariadb' + db-version: '9.4' + - db-type: 'mysql' + db-vetsion: '12.0.2' with: os: ${{ matrix.os }} php: ${{ matrix.php }} From 6847799edee82466660ee308d5f463b3d2c903fa Mon Sep 17 00:00:00 2001 From: Aaron Jorbin <622599+aaronjorbin@users.noreply.github.com> Date: Fri, 3 Oct 2025 13:51:26 +0200 Subject: [PATCH 2/4] spelling --- .github/workflows/phpunit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml index 27b58119548bd..c8d73ed28727b 100644 --- a/.github/workflows/phpunit-tests.yml +++ b/.github/workflows/phpunit-tests.yml @@ -218,7 +218,7 @@ jobs: - db-type: 'mariadb' db-version: '9.4' - db-type: 'mysql' - db-vetsion: '12.0.2' + db-version: '12.0.2' with: os: ${{ matrix.os }} php: ${{ matrix.php }} From a7c4de2ae2eac9aba5162b5c07e99172def0e369 Mon Sep 17 00:00:00 2001 From: Aaron Jorbin Date: Fri, 3 Oct 2025 07:34:50 -0500 Subject: [PATCH 3/4] Update .github/workflows/phpunit-tests.yml Co-authored-by: Jonathan Desrosiers <359867+desrosj@users.noreply.github.com> --- .github/workflows/phpunit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml index c8d73ed28727b..45c82cc037c29 100644 --- a/.github/workflows/phpunit-tests.yml +++ b/.github/workflows/phpunit-tests.yml @@ -203,7 +203,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.4', '12.0.2' ] + db-version: [ '9.4', '12.0' ] multisite: [ false, true ] memcached: [ false ] db-innovation: [ true ] From 58b6d6452deea9b1be9467eedfd2c909f7ea31a0 Mon Sep 17 00:00:00 2001 From: Aaron Jorbin <622599+aaronjorbin@users.noreply.github.com> Date: Fri, 3 Oct 2025 14:48:12 +0200 Subject: [PATCH 4/4] 12.0 everwhere --- .github/workflows/phpunit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml index 45c82cc037c29..4962cec77ab64 100644 --- a/.github/workflows/phpunit-tests.yml +++ b/.github/workflows/phpunit-tests.yml @@ -218,7 +218,7 @@ jobs: - db-type: 'mariadb' db-version: '9.4' - db-type: 'mysql' - db-version: '12.0.2' + db-version: '12.0' with: os: ${{ matrix.os }} php: ${{ matrix.php }}