From 71e524d7c159e3041476d7c7f275915dcb834d2d Mon Sep 17 00:00:00 2001 From: kolaente Date: Sat, 11 Apr 2026 18:11:31 +0200 Subject: [PATCH] ci: rename 'mysql' matrix leg to 'mariadb' to match reality MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 'mysql' matrix key actually pulls mariadb:12 as its service image in both test-api and test-migration-smoke. Renaming makes the matrix identity honest and prepares for a future mysql-8 leg. The underlying VIKUNJA_DATABASE_TYPE is still 'mysql' because the driver is wire-compatible with both engines — the matrix name is a CI-side label only. No behavioural change. --- .github/workflows/test.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 80afac916..edf26be1f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -101,10 +101,10 @@ jobs: db: - sqlite - postgres - - mysql + - mariadb services: - migration-smoke-db-mysql: - image: mariadb:12@sha256:f54db0cb3ccfe9431aba6d08c65a1763c499789b116b4cb651dd7fcf325965b3 + migration-smoke-db-mariadb: + image: ${{ matrix.db == 'mariadb' && 'mariadb:12@sha256:f54db0cb3ccfe9431aba6d08c65a1763c499789b116b4cb651dd7fcf325965b3' || '' }} env: MYSQL_ROOT_PASSWORD: vikunjatest MYSQL_DATABASE: vikunjatest @@ -128,7 +128,7 @@ jobs: name: vikunja_bin - name: run migration env: - VIKUNJA_DATABASE_TYPE: ${{ matrix.db }} + VIKUNJA_DATABASE_TYPE: ${{ matrix.db == 'mariadb' && 'mysql' || matrix.db }} VIKUNJA_DATABASE_PATH: ./vikunja-migration-test.db VIKUNJA_DATABASE_USER: ${{ matrix.db == 'postgres' && 'postgres' || 'root' }} VIKUNJA_DATABASE_PASSWORD: vikunjatest @@ -173,14 +173,14 @@ jobs: - sqlite-in-memory - sqlite - postgres - - mysql + - mariadb - paradedb test: - feature - web services: - db-mysql: - image: ${{ matrix.db == 'mysql' && 'mariadb:12@sha256:5b6a1eac15b85b981a61afb89aea2a22bf76b5f58809d05f0bcc13ab6ec44cb8' || '' }} + db-mariadb: + image: ${{ matrix.db == 'mariadb' && 'mariadb:12@sha256:5b6a1eac15b85b981a61afb89aea2a22bf76b5f58809d05f0bcc13ab6ec44cb8' || '' }} env: MYSQL_ROOT_PASSWORD: vikunjatest MYSQL_DATABASE: vikunjatest @@ -226,8 +226,8 @@ jobs: - name: test env: VIKUNJA_TESTS_USE_CONFIG: ${{ matrix.db != 'sqlite-in-memory' && 1 || 0 }} - VIKUNJA_DATABASE_TYPE: ${{ matrix.db == 'paradedb' && 'postgres' || matrix.db }} - VIKUNJA_DATABASE_USER: ${{ matrix.db == 'mysql' && 'root' || 'postgres' }} + VIKUNJA_DATABASE_TYPE: ${{ (matrix.db == 'paradedb' && 'postgres') || (matrix.db == 'mariadb' && 'mysql') || matrix.db }} + VIKUNJA_DATABASE_USER: ${{ matrix.db == 'mariadb' && 'root' || 'postgres' }} VIKUNJA_DATABASE_PASSWORD: vikunjatest VIKUNJA_DATABASE_DATABASE: vikunjatest VIKUNJA_DATABASE_SSLMODE: disable