From a4cca37f02fd8b3a861e3d194e43e6717c45c3e1 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 23 Jan 2025 10:08:34 +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 72b6c6c27..207e61db6 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -28,7 +28,7 @@ jobs: matrix: php-versions: ['8.1'] databases: ['sqlite', 'mysql', 'pgsql'] - server-versions: ['master'] + server-versions: ['stable31'] name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} diff --git a/composer.json b/composer.json index f359d91b5..3366ff6d7 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "roave/security-advisories": "dev-master", "phpunit/phpunit": "^9", "nextcloud/coding-standard": "^1.1", - "nextcloud/ocp": "dev-master", + "nextcloud/ocp": "dev-stable31", "psalm/phar": "^5.13" }, "config": { diff --git a/composer.lock b/composer.lock index f5cb6ffbc..0c34981a4 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": "6950663d9d213151028e780637480220", + "content-hash": "c89537a172cee5c19093b4ea0cb5365c", "packages": [ { "name": "icecave/parity", @@ -488,30 +488,29 @@ }, { "name": "nextcloud/ocp", - "version": "dev-master", + "version": "dev-stable31", "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "ed23f703c172ba167a62a76f7b2d8a6b4e37f44f" + "reference": "3ac4be37f04642c663a2fc711f3848f69f3713f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/ed23f703c172ba167a62a76f7b2d8a6b4e37f44f", - "reference": "ed23f703c172ba167a62a76f7b2d8a6b4e37f44f", + "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/", @@ -531,9 +530,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-10T00:44:36+00:00" + "time": "2025-01-23T08:35:12+00:00" }, { "name": "nikic/php-parser",