Merge pull request #994 from nextcloud/ci/mariadb-11.4

ci: test against MariaDB 11.4 (too)

Author: ChristophWurst

.github/workflows/phpunit-mariadb.yml

@@ -68,7 +68,7 @@ jobs:
       matrix:
         php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
         server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
-        mariadb-versions: ['10.6', '10.11']
+        mariadb-versions: ['10.6', '10.11', '11.4']
 
     name: MariaDB ${{ matrix.mariadb-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
 
@@ -78,8 +78,12 @@ jobs:
         ports:
           - 4444:3306/tcp
         env:
-          MYSQL_ROOT_PASSWORD: rootpassword
-        options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5
+          MARIADB_ROOT_PASSWORD: rootpassword
+        options: >-
+          --health-cmd="mariadb-admin ping"
+          --health-interval=5s
+          --health-timeout=2s
+          --health-retries=5
 
     steps:
       - name: Set app env

.github/workflows/profile.yml

@@ -28,19 +28,19 @@ jobs:
     name: php${{ matrix.php-version }} ${{ matrix.flag }} profiling
     services:
       mysql-service:
-        image: mariadb:10.11
+        image: ghcr.io/nextcloud/continuous-integration-mariadb-11.4:latest
         env:
-          MYSQL_ROOT_PASSWORD: my-secret-pw
-          MYSQL_DATABASE: nextcloud
-          MYSQL_USER: nextcloud
-          MYSQL_PASSWORD: nextcloud
+          MARIADB_ROOT_PASSWORD: my-secret-pw
+          MARIADB_DATABASE: nextcloud
+          MARIADB_USER: nextcloud
+          MARIADB_PASSWORD: nextcloud
         ports:
           - 3306:3306
         options: >-
-          --health-cmd="mysqladmin ping"
-          --health-interval=10s
-          --health-timeout=5s
-          --health-retries=3
+          --health-cmd="mariadb-admin ping"
+          --health-interval=5s
+          --health-timeout=2s
+          --health-retries=5
     steps:
       - name: Set up php${{ matrix.php-version }}
         uses: shivammathur/setup-php@master