From 9ac41d1e7cb69816f35cebd58fce7efb7168d1ed Mon Sep 17 00:00:00 2001 From: nextcloud-command Date: Sun, 26 Jan 2025 02:45:56 +0000 Subject: [PATCH 1/2] chore(dev-deps): Bump nextcloud/ocp package Signed-off-by: GitHub --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index a0a1513..30ab166 100644 --- a/composer.lock +++ b/composer.lock @@ -231,16 +231,16 @@ "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "ba6108b934c18b629f78c48cca3fc038087f0dec" + "reference": "df0b0d885420a4168cd1470ee33364a3369bed1c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/ba6108b934c18b629f78c48cca3fc038087f0dec", - "reference": "ba6108b934c18b629f78c48cca3fc038087f0dec", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/df0b0d885420a4168cd1470ee33364a3369bed1c", + "reference": "df0b0d885420a4168cd1470ee33364a3369bed1c", "shasum": "" }, "require": { - "php": "~8.1 || ~8.2 || ~8.3", + "php": "~8.1 || ~8.2 || ~8.3 || ~8.4", "psr/clock": "^1.0", "psr/container": "^2.0.2", "psr/event-dispatcher": "^1.0", @@ -250,7 +250,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "31.0.0-dev" + "dev-master": "32.0.0-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -272,7 +272,7 @@ "issues": "https://github.com/nextcloud-deps/ocp/issues", "source": "https://github.com/nextcloud-deps/ocp/tree/master" }, - "time": "2025-01-17T00:42:09+00:00" + "time": "2025-01-25T00:41:21+00:00" }, { "name": "nikic/php-parser", From 2dc2101a770f4feddfa7b59ad7f6b16e84a59514 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 27 Jan 2025 05:47:49 +0100 Subject: [PATCH 2/2] ci: Try .github PR 499 Signed-off-by: Joas Schilling --- .github/workflows/phpunit-mariadb.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml index 37ae1e3..c16e779 100644 --- a/.github/workflows/phpunit-mariadb.yml +++ b/.github/workflows/phpunit-mariadb.yml @@ -80,8 +80,8 @@ 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