From 18029911e3f0c08ad8e31a35c903561dcd80d1c2 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 23 Jan 2025 10:13:13 +0100 Subject: [PATCH] chore(CI): Adjust testing matrix for Nextcloud 31 on stable31 Signed-off-by: Joas Schilling --- .github/workflows/integration.yml | 2 +- composer.json | 2 +- composer.lock | 19 +++++++++---------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index f9a4bea..9c25710 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -29,7 +29,7 @@ jobs: matrix: php-versions: ['8.1', '8.2', '8.3'] databases: ['sqlite'] - server-versions: ['master'] + server-versions: ['stable31'] name: integration-php${{ matrix.php-versions }}-${{ matrix.databases }} diff --git a/composer.json b/composer.json index 5e6f5e7..5d91394 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "phpunit/phpunit": "^9.5", "nextcloud/coding-standard": "^1.3", "psalm/phar": "^5.26", - "nextcloud/ocp": "dev-master" + "nextcloud/ocp": "dev-stable31" }, "extra": { "patches": { diff --git a/composer.lock b/composer.lock index 3863feb..dbb6a30 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "25744f82fd39c64aeb2da1c91553ed77", + "content-hash": "aad5cc56aca009124e52942b9ac398c9", "packages": [ { "name": "bamarni/composer-bin-plugin", @@ -470,30 +470,29 @@ }, { "name": "nextcloud/ocp", - "version": "dev-master", + "version": "dev-stable31", "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "ba6108b934c18b629f78c48cca3fc038087f0dec" + "reference": "3ac4be37f04642c663a2fc711f3848f69f3713f1" }, "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/3ac4be37f04642c663a2fc711f3848f69f3713f1", + "reference": "3ac4be37f04642c663a2fc711f3848f69f3713f1", "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", "psr/log": "^3.0.2" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-master": "31.0.0-dev" + "dev-stable31": "31.0.0-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -513,9 +512,9 @@ "description": "Composer package containing Nextcloud's public OCP API and the unstable NCU API", "support": { "issues": "https://github.com/nextcloud-deps/ocp/issues", - "source": "https://github.com/nextcloud-deps/ocp/tree/master" + "source": "https://github.com/nextcloud-deps/ocp/tree/stable31" }, - "time": "2025-01-17T00:42:09+00:00" + "time": "2025-01-23T08:35:12+00:00" }, { "name": "nikic/php-parser",