From 7e4a76eafe6658794fe0af5a72e6b279467bf00e Mon Sep 17 00:00:00 2001 From: sgiehl Date: Sat, 18 Jul 2026 16:08:46 +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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/matomo-tests.yml b/.github/workflows/matomo-tests.yml index ca1046c..5eece78 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: 'LogViewer' 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' }} @@ -68,6 +73,8 @@ jobs: plugin-name: 'LogViewer' matomo-test-branch: 'maximum_supported_matomo' test-type: 'UI' + mysql-engine: 'Mysql' + mysql-version: '8.0' php-version: '8.1' node-version: '16' artifacts-pass: ${{ secrets.ARTIFACTS_PASS }} From 7e54164066678706cc3057255d30c1e0f1852ada Mon Sep 17 00:00:00 2001 From: sgiehl Date: Mon, 20 Jul 2026 11:20:25 +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 5eece78..39041f0 100644 --- a/.github/workflows/matomo-tests.yml +++ b/.github/workflows/matomo-tests.yml @@ -59,7 +59,7 @@ 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' }} UI: runs-on: ubuntu-24.04 steps: