From 266bfb0f0075ea0c07703f6059e069d14affeb4e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 15 May 2026 12:08:21 +0200 Subject: [PATCH 1/2] chore(CI): Adjust testing matrix for Nextcloud 34 on stable34 Signed-off-by: Joas Schilling --- composer.json | 2 +- composer.lock | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index b54089fb6c6..fcd727cd672 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "psalm/phar": "^6.5", "phpunit/phpunit": "^9.5", "ext-mbstring": "*", - "nextcloud/ocp": "dev-master" + "nextcloud/ocp": "dev-stable34" }, "license": "AGPLv3", "authors": [ diff --git a/composer.lock b/composer.lock index 6cc8e845209..6639fa45fbc 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": "aa7ad7998a3e919c3af9edf2f92eaa22", + "content-hash": "242f86923a72d904fab080ec516a34c2", "packages": [], "packages-dev": [ { @@ -236,16 +236,16 @@ }, { "name": "nextcloud/ocp", - "version": "dev-master", + "version": "dev-stable34", "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "f3fddf2af92f48d3f53569074f69f0ae4bad52b6" + "reference": "72de02fbad95545055983d050e564fe39128992d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/f3fddf2af92f48d3f53569074f69f0ae4bad52b6", - "reference": "f3fddf2af92f48d3f53569074f69f0ae4bad52b6", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/72de02fbad95545055983d050e564fe39128992d", + "reference": "72de02fbad95545055983d050e564fe39128992d", "shasum": "" }, "require": { @@ -256,11 +256,10 @@ "psr/http-client": "^1.0.3", "psr/log": "^3.0.2" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-master": "34.0.0-dev" + "dev-stable34": "34.0.0-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -280,9 +279,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/stable34" }, - "time": "2026-05-09T01:52:54+00:00" + "time": "2026-05-15T08:43:27+00:00" }, { "name": "nikic/php-parser", From 205c356b56d004f6d7a382521034106d555abbf0 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 15 May 2026 12:08:21 +0200 Subject: [PATCH 2/2] chore(branchoff): Set version on stable34 to a stable one Signed-off-by: Joas Schilling Signed-off-by: Jonas --- .github/workflows/cypress-e2e.yml | 2 +- .github/workflows/npm-audit-fix.yml | 1 + .github/workflows/update-nextcloud-ocp.yml | 1 + appinfo/info.xml | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cypress-e2e.yml b/.github/workflows/cypress-e2e.yml index effce70a12e..2055f76bc04 100644 --- a/.github/workflows/cypress-e2e.yml +++ b/.github/workflows/cypress-e2e.yml @@ -26,7 +26,7 @@ jobs: npmVersion: ${{ steps.versions.outputs.npmVersion }} strategy: matrix: - server-versions: ['master'] + server-versions: ['stable34'] steps: - name: Checkout server diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml index 1d931b11e7e..c46a1137b63 100644 --- a/.github/workflows/npm-audit-fix.yml +++ b/.github/workflows/npm-audit-fix.yml @@ -26,6 +26,7 @@ jobs: matrix: branches: - ${{ github.event.repository.default_branch }} + - 'stable34' - 'stable33' - 'stable32' diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index a3c0f23e2cb..efb5d65007d 100644 --- a/.github/workflows/update-nextcloud-ocp.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -26,6 +26,7 @@ jobs: matrix: branches: - ${{ github.event.repository.default_branch }} + - 'stable34' - 'stable33' - 'stable32' diff --git a/appinfo/info.xml b/appinfo/info.xml index cfacbd557b7..c942ddcf5d2 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -15,7 +15,7 @@ - **๐Ÿ’พ Open format:** Files are saved as [Markdown](https://en.wikipedia.org/wiki/Markdown), so you can edit them from any other text app too. - **โœŠ Strong foundation:** We use [๐Ÿˆ tiptap](https://tiptap.scrumpy.io) which is based on [๐Ÿฆ‰ ProseMirror](https://prosemirror.net) โ€“ huge thanks to them! ]]> - 8.0.0-dev.1 + 8.0.0 agpl Julius Hรคrtl Text