From 5fcfd232fab0f8436366bbec4ddcee4ecdc6433f Mon Sep 17 00:00:00 2001 From: sgiehl Date: Sat, 18 Jul 2026 16:09:14 +0200 Subject: [PATCH 1/2] Run plugin tests against MySQL 8.0 and MariaDB 10.6 The workflow inherited the shared action's MySQL 5.7 default, which is below Matomo's new minimum. Pin the database-backed jobs to the supported floor: PluginTests now runs a MySQL 8.0 + MariaDB 10.6 matrix, and the UI/JS jobs run on MySQL 8.0. --- .github/workflows/matomo-tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/matomo-tests.yml b/.github/workflows/matomo-tests.yml index 6d08222d..f5927bfe 100644 --- a/.github/workflows/matomo-tests.yml +++ b/.github/workflows/matomo-tests.yml @@ -39,6 +39,9 @@ jobs: matrix: php: [ '8.1', '8.5' ] target: ['minimum_required_matomo', 'maximum_supported_matomo'] + database: + - { engine: 'Mysql', version: '8.0' } + - { engine: 'Mariadb', version: '10.6' } steps: - uses: actions/checkout@v3 with: @@ -52,6 +55,8 @@ jobs: plugin-name: 'DeviceDetectorCache' php-version: ${{ matrix.php }} test-type: 'PluginTests' + mysql-engine: ${{ matrix.database.engine }} + mysql-version: ${{ matrix.database.version }} matomo-test-branch: ${{ matrix.target }} artifacts-pass: ${{ secrets.ARTIFACTS_PASS }} upload-artifacts: ${{ matrix.php == '8.1' && matrix.target == 'maximum_supported_matomo' }} From 57c1e6957822cf4fe611cc628aa0ade117f4dd26 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Mon, 20 Jul 2026 11:20:41 +0200 Subject: [PATCH 2/2] Only upload plugin test artifacts for the MySQL matrix leg PluginTests runs a MySQL + MariaDB matrix; the upload-artifacts condition matched both legs and uploaded twice. Restrict the upload to the MySQL leg. --- .github/workflows/matomo-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/matomo-tests.yml b/.github/workflows/matomo-tests.yml index f5927bfe..d41bccf8 100644 --- a/.github/workflows/matomo-tests.yml +++ b/.github/workflows/matomo-tests.yml @@ -59,4 +59,4 @@ jobs: mysql-version: ${{ matrix.database.version }} matomo-test-branch: ${{ matrix.target }} artifacts-pass: ${{ secrets.ARTIFACTS_PASS }} - upload-artifacts: ${{ matrix.php == '8.1' && matrix.target == 'maximum_supported_matomo' }} + upload-artifacts: ${{ matrix.php == '8.1' && matrix.target == 'maximum_supported_matomo' && matrix.database.engine == 'Mysql' }}