From 038e5139f5dae2cddb89ea0c0906ed5df4f725db Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 22 Jan 2026 11:43:32 +0100 Subject: [PATCH 1/2] chore(CI): Adjust testing matrix for Nextcloud 33 on stable33 Signed-off-by: Joas Schilling --- .github/workflows/integration.yml | 2 +- composer.json | 2 +- composer.lock | 21 ++++++++++----------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 03e2738b6b..f8128ab1b4 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -28,7 +28,7 @@ jobs: matrix: php-versions: ['8.2'] databases: ['sqlite', 'mysql', 'pgsql'] - server-versions: ['master'] + server-versions: ['stable33'] name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} diff --git a/composer.json b/composer.json index 245ac52e45..83ab297985 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "roave/security-advisories": "dev-master", "phpunit/phpunit": "^9", "nextcloud/coding-standard": "^1.1", - "nextcloud/ocp": "dev-master" + "nextcloud/ocp": "dev-stable33" }, "config": { "optimize-autoloader": true, diff --git a/composer.lock b/composer.lock index 365e8237a1..54d7a78a7d 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": "381772900da2d4ccd327212035343550", + "content-hash": "ca503054d86a4763cfb01c350609b77e", "packages": [ { "name": "bamarni/composer-bin-plugin", @@ -433,30 +433,29 @@ }, { "name": "nextcloud/ocp", - "version": "dev-master", + "version": "dev-stable33", "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "6c1e5686d00c40f57abd83e8ad268e9ab34825bb" + "reference": "42bd0340ad5ac84615ba9ce83a488ce858a848bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/6c1e5686d00c40f57abd83e8ad268e9ab34825bb", - "reference": "6c1e5686d00c40f57abd83e8ad268e9ab34825bb", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/42bd0340ad5ac84615ba9ce83a488ce858a848bf", + "reference": "42bd0340ad5ac84615ba9ce83a488ce858a848bf", "shasum": "" }, "require": { - "php": "~8.1 || ~8.2 || ~8.3 || ~8.4", + "php": "~8.1 || ~8.2 || ~8.3 || ~8.4 || ~8.5", "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": "33.0.0-dev" + "dev-stable33": "33.0.0-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -476,9 +475,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/stable33" }, - "time": "2026-01-09T00:57:54+00:00" + "time": "2026-01-22T08:46:28+00:00" }, { "name": "nikic/php-parser", @@ -3210,5 +3209,5 @@ "platform-overrides": { "php": "8.1" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.9.0" } From 26a0231779c45e77971ede051321f59150150aad Mon Sep 17 00:00:00 2001 From: grnd-alt Date: Thu, 22 Jan 2026 14:11:33 +0100 Subject: [PATCH 2/2] chore(ci): adjust cypress ci to run against server stable33 Signed-off-by: grnd-alt --- .github/workflows/cypress-e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress-e2e.yml b/.github/workflows/cypress-e2e.yml index 7cdd1f07fa..cf7d9bf849 100644 --- a/.github/workflows/cypress-e2e.yml +++ b/.github/workflows/cypress-e2e.yml @@ -22,7 +22,7 @@ jobs: node-version: [20.x] containers: [1, 2, 3] php-versions: [ '8.2' ] - server-versions: [ 'master' ] + server-versions: [ 'stable33' ] name: runner ${{ matrix.containers }}