From fe772c6b33efa271fe9e63052dbcd570c8e41666 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Fri, 13 Jun 2025 18:09:44 +0200 Subject: [PATCH 1/2] ci: test against MariaDB 11.4 (too) Signed-off-by: Christoph Wurst --- .github/workflows/phpunit-mariadb.yml | 2 +- .github/workflows/profile.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml index 3370fe77..3d184ca7 100644 --- a/.github/workflows/phpunit-mariadb.yml +++ b/.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 }} diff --git a/.github/workflows/profile.yml b/.github/workflows/profile.yml index 57f39e58..b286d0b0 100644 --- a/.github/workflows/profile.yml +++ b/.github/workflows/profile.yml @@ -28,7 +28,7 @@ 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 From 023b6599f8f23e0d2fd3113cea943b4ad805aad3 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Mon, 16 Jun 2025 08:51:32 +0200 Subject: [PATCH 2/2] fixup! ci: test against MariaDB 11.4 (too) Signed-off-by: Christoph Wurst --- .github/workflows/phpunit-mariadb.yml | 8 ++++++-- .github/workflows/profile.yml | 16 ++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml index 3d184ca7..666842db 100644 --- a/.github/workflows/phpunit-mariadb.yml +++ b/.github/workflows/phpunit-mariadb.yml @@ -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 diff --git a/.github/workflows/profile.yml b/.github/workflows/profile.yml index b286d0b0..71059895 100644 --- a/.github/workflows/profile.yml +++ b/.github/workflows/profile.yml @@ -30,17 +30,17 @@ jobs: mysql-service: 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