diff --git a/.github/workflows/integration-federation.yml b/.github/workflows/integration-federation.yml
index 09eae7fc42d..33677e72959 100644
--- a/.github/workflows/integration-federation.yml
+++ b/.github/workflows/integration-federation.yml
@@ -54,11 +54,11 @@ jobs:
- test-suite: 'federation'
php-versions: '8.2'
host-db: 'oci'
- host-server-versions: 'master'
+ host-server-versions: 'stable34'
host-spreed-versions: ${{ github.event.pull_request.head.sha }}
host-guests-versions: 'main'
- host-circles-versions: 'master'
- host-notifications-versions: 'master'
+ host-circles-versions: 'stable34'
+ host-notifications-versions: 'stable34'
remote-db: 'mysql'
remote-server-versions: 'stable33'
remote-spreed-versions: 'stable33'
@@ -68,11 +68,11 @@ jobs:
- test-suite: 'federation'
php-versions: '8.2'
host-db: 'pgsql'
- host-server-versions: 'master'
+ host-server-versions: 'stable34'
host-spreed-versions: ${{ github.event.pull_request.head.sha }}
host-guests-versions: 'main'
- host-circles-versions: 'master'
- host-notifications-versions: 'master'
+ host-circles-versions: 'stable34'
+ host-notifications-versions: 'stable34'
remote-db: 'mysql'
remote-server-versions: 'stable33'
remote-spreed-versions: 'stable33'
@@ -88,11 +88,11 @@ jobs:
host-circles-versions: 'stable33'
host-notifications-versions: 'stable33'
remote-db: 'mysql'
- remote-server-versions: 'master'
+ remote-server-versions: 'stable34'
remote-spreed-versions: ${{ github.event.pull_request.head.sha }}
remote-guests-versions: 'main'
- remote-circles-versions: 'master'
- remote-notifications-versions: 'master'
+ remote-circles-versions: 'stable34'
+ remote-notifications-versions: 'stable34'
services:
oracle:
diff --git a/.github/workflows/integration-mariadb.yml b/.github/workflows/integration-mariadb.yml
index c24271c2add..42f29a7965f 100644
--- a/.github/workflows/integration-mariadb.yml
+++ b/.github/workflows/integration-mariadb.yml
@@ -54,11 +54,11 @@ jobs:
matrix:
test-suite: ['callapi', 'chat-1', 'chat-2', 'chat-3', 'chat-4', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
php-versions: ['8.2']
- server-versions: ['master']
+ server-versions: ['stable34']
guests-versions: ['main']
- circles-versions: ['master']
- notifications-versions: ['master']
- password-policy-versions: ['master']
+ circles-versions: ['stable34']
+ notifications-versions: ['stable34']
+ password-policy-versions: ['stable34']
services:
mariadb:
diff --git a/.github/workflows/integration-mysql.yml b/.github/workflows/integration-mysql.yml
index d54a2051596..037ac45a863 100644
--- a/.github/workflows/integration-mysql.yml
+++ b/.github/workflows/integration-mysql.yml
@@ -54,11 +54,11 @@ jobs:
matrix:
test-suite: ['callapi', 'chat-1', 'chat-2', 'chat-3', 'chat-4', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
php-versions: ['8.2']
- server-versions: ['master']
+ server-versions: ['stable34']
guests-versions: ['main']
- circles-versions: ['master']
- notifications-versions: ['master']
- password-policy-versions: ['master']
+ circles-versions: ['stable34']
+ notifications-versions: ['stable34']
+ password-policy-versions: ['stable34']
services:
mysql:
diff --git a/.github/workflows/integration-oci.yml b/.github/workflows/integration-oci.yml
index 78c7b8bb80f..a22748f90fa 100644
--- a/.github/workflows/integration-oci.yml
+++ b/.github/workflows/integration-oci.yml
@@ -54,11 +54,11 @@ jobs:
matrix:
test-suite: ['callapi', 'chat-1', 'chat-2', 'chat-3', 'chat-4', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
php-versions: ['8.2']
- server-versions: ['master']
+ server-versions: ['stable34']
guests-versions: ['main']
- circles-versions: ['master']
- notifications-versions: ['master']
- password-policy-versions: ['master']
+ circles-versions: ['stable34']
+ notifications-versions: ['stable34']
+ password-policy-versions: ['stable34']
services:
oracle:
diff --git a/.github/workflows/integration-pgsql.yml b/.github/workflows/integration-pgsql.yml
index 90e7eb8e37f..004b20b1bb0 100644
--- a/.github/workflows/integration-pgsql.yml
+++ b/.github/workflows/integration-pgsql.yml
@@ -69,11 +69,11 @@ jobs:
- 'sharing-3'
- 'sharing-4'
php-versions: ['8.3']
- server-versions: ['master']
+ server-versions: ['stable34']
guests-versions: ['main']
- circles-versions: ['master']
- notifications-versions: ['master']
- password-policy-versions: ['master']
+ circles-versions: ['stable34']
+ notifications-versions: ['stable34']
+ password-policy-versions: ['stable34']
services:
postgres:
diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml
index 2dcc30a6b8a..de6e166c95e 100644
--- a/.github/workflows/integration-sqlite.yml
+++ b/.github/workflows/integration-sqlite.yml
@@ -54,11 +54,11 @@ jobs:
matrix:
test-suite: ['callapi', 'chat-1', 'chat-2', 'chat-3', 'chat-4', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
php-versions: ['8.2']
- server-versions: ['master']
+ server-versions: ['stable34']
guests-versions: ['main']
- circles-versions: ['master']
- notifications-versions: ['master']
- password-policy-versions: ['master']
+ circles-versions: ['stable34']
+ notifications-versions: ['stable34']
+ password-policy-versions: ['stable34']
steps:
- name: Set app env
diff --git a/.github/workflows/occ-command-documentation.yml b/.github/workflows/occ-command-documentation.yml
index 43ff440e13e..78c5c008c1f 100644
--- a/.github/workflows/occ-command-documentation.yml
+++ b/.github/workflows/occ-command-documentation.yml
@@ -7,15 +7,8 @@ on:
pull_request:
paths:
- '.github/workflows/**'
- - 'appinfo/**'
- - 'lib/**'
- - 'templates/**'
- - 'tests/**'
- - 'vendor/**'
- - 'vendor-bin/**'
- - '.php-cs-fixer.dist.php'
- - 'composer.json'
- - 'composer.lock'
+ - 'docs/commands.md'
+ - 'lib/Command/**'
permissions:
contents: read
@@ -25,13 +18,30 @@ concurrency:
cancel-in-progress: true
jobs:
+ matrix:
+ runs-on: ubuntu-latest-low
+ outputs:
+ php-version: ${{ steps.versions.outputs.php-available-list }}
+ server-max: ${{ steps.versions.outputs.branches-max-list }}
+ steps:
+ - name: Checkout app
+ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ with:
+ persist-credentials: false
+
+ - name: Get version matrix
+ id: versions
+ uses: icewind1991/nextcloud-version-matrix@8a7bac6300b2f0f3100088b297995a229558ddba # v1.3.2
+
occ-commands:
runs-on: ubuntu-latest
+ needs: [matrix]
+
strategy:
matrix:
- php-versions: ['8.2']
- server-versions: ['master']
+ php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
+ server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
steps:
- name: Set app env
diff --git a/composer.json b/composer.json
index 6878259dad2..dc01b45b81d 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
"test:unit": "vendor/bin/phpunit -c tests/php/phpunit.xml --colors=always --fail-on-warning --fail-on-risky --display-deprecations --display-phpunit-deprecations"
},
"require-dev": {
- "nextcloud/ocp": "dev-master"
+ "nextcloud/ocp": "dev-stable34"
},
"require": {
"bamarni/composer-bin-plugin": "^1.9",
diff --git a/composer.lock b/composer.lock
index 072c231ba08..57442e42152 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": "5dadff7e7c20e43e3defc9caf230b965",
+ "content-hash": "470bb2623c748defc8e4c6a2eb5964cb",
"packages": [
{
"name": "bamarni/composer-bin-plugin",
@@ -331,16 +331,16 @@
"packages-dev": [
{
"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": {
@@ -351,11 +351,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/",
@@ -375,9 +374,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": "psr/clock",
diff --git a/tests/integration/run.sh b/tests/integration/run.sh
index 2574674b17d..89bfd246d46 100755
--- a/tests/integration/run.sh
+++ b/tests/integration/run.sh
@@ -6,10 +6,10 @@
PROCESS_ID=$$
APP_NAME=spreed
-NOTIFICATIONS_BRANCH="master"
+NOTIFICATIONS_BRANCH="stable34"
GUESTS_BRANCH="main"
-CIRCLES_BRANCH="master"
-PASSWORD_POLICY_BRANCH="master"
+CIRCLES_BRANCH="stable34"
+PASSWORD_POLICY_BRANCH="stable34"
APP_INTEGRATION_DIR=$PWD
ROOT_DIR=${APP_INTEGRATION_DIR}/../../../..
diff --git a/tests/integration/talk_webhook_demo/appinfo/info.xml b/tests/integration/talk_webhook_demo/appinfo/info.xml
index 355b7ce6973..7e9c6401406 100644
--- a/tests/integration/talk_webhook_demo/appinfo/info.xml
+++ b/tests/integration/talk_webhook_demo/appinfo/info.xml
@@ -10,7 +10,7 @@
- 23.0.0
+ 24.0.0
agpl
Joas Schilling
@@ -19,7 +19,7 @@
https://github.com/nextcloud/spreed/issues
-
+