Merge branch 'master-next' into feature/next

Author: Marick van Tuil

.github/workflows/run-tests.yml

@@ -97,9 +97,9 @@ jobs:
           CI_SERVICE_ACCOUNT_JSON_KEY: ${{ secrets.CI_SERVICE_ACCOUNT_JSON_KEY }}
         run: |
           touch .env
-          if [ "${{ matrix.db }}" = "mysql" ]; then
+          if [ "${{ matrix.db.driver }}" = "mysql" ]; then
             MYSQL_PORT=3307 MYSQL_VERSION=${{ matrix.db.version }} docker compose up ${{ matrix.db.driver }} -d
-          elif [ "${{ matrix.db }}" = "pgsql" ]; then
+          elif [ "${{ matrix.db.driver }}" = "pgsql" ]; then
             POSTGRES_PORT=5432 PGSQL_VERSION=${{ matrix.db.version }} docker compose up ${{ matrix.db.driver }} -d
           fi
       - name: Install dependencies