From 5de49e08ca48e3c1e17056f1863eb1a4e5c8a124 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 26 Aug 2026 07:18:39 +0200 Subject: [PATCH] chore(CI): Adjust testing matrix for Nextcloud 35 on stable35 Signed-off-by: Joas Schilling --- .github/workflows/integration-federation.yml | 18 +++++++++--------- .github/workflows/integration-mariadb.yml | 8 ++++---- .github/workflows/integration-mysql.yml | 8 ++++---- .github/workflows/integration-pgsql.yml | 8 ++++---- .github/workflows/integration-sqlite.yml | 8 ++++---- .../workflows/occ-command-documentation.yml | 2 +- composer.json | 2 +- composer.lock | 5 ++--- 8 files changed, 29 insertions(+), 30 deletions(-) diff --git a/.github/workflows/integration-federation.yml b/.github/workflows/integration-federation.yml index 620c508e7c0..6b05bdb8e4e 100644 --- a/.github/workflows/integration-federation.yml +++ b/.github/workflows/integration-federation.yml @@ -54,11 +54,11 @@ jobs: - test-suite: 'federation' php-versions: '8.3' host-db: 'oci' - host-server-versions: 'master' + host-server-versions: 'stable35' host-spreed-versions: ${{ github.event.pull_request.head.sha }} host-guests-versions: 'main' - host-circles-versions: 'master' - host-notifications-versions: 'master' + host-circles-versions: 'stable35' + host-notifications-versions: 'stable35' remote-db: 'mysql' remote-server-versions: 'stable34' remote-spreed-versions: 'stable34' @@ -68,11 +68,11 @@ jobs: - test-suite: 'federation' php-versions: '8.3' host-db: 'pgsql' - host-server-versions: 'master' + host-server-versions: 'stable35' host-spreed-versions: ${{ github.event.pull_request.head.sha }} host-guests-versions: 'main' - host-circles-versions: 'master' - host-notifications-versions: 'master' + host-circles-versions: 'stable35' + host-notifications-versions: 'stable35' remote-db: 'mysql' remote-server-versions: 'stable34' remote-spreed-versions: 'stable34' @@ -88,11 +88,11 @@ jobs: host-circles-versions: 'stable34' host-notifications-versions: 'stable34' remote-db: 'mysql' - remote-server-versions: 'master' + remote-server-versions: 'stable35' remote-spreed-versions: ${{ github.event.pull_request.head.sha }} remote-guests-versions: 'main' - remote-circles-versions: 'master' - remote-notifications-versions: 'master' + remote-circles-versions: 'stable35' + remote-notifications-versions: 'stable35' services: oracle: diff --git a/.github/workflows/integration-mariadb.yml b/.github/workflows/integration-mariadb.yml index 1af5069a4a0..63aebcb7152 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.3'] - server-versions: ['master'] + server-versions: ['stable35'] guests-versions: ['main'] - circles-versions: ['master'] - notifications-versions: ['master'] - password-policy-versions: ['master'] + circles-versions: ['stable35'] + notifications-versions: ['stable35'] + password-policy-versions: ['stable35'] services: mariadb: diff --git a/.github/workflows/integration-mysql.yml b/.github/workflows/integration-mysql.yml index d350bddd2dd..044c7583764 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.3'] - server-versions: ['master'] + server-versions: ['stable35'] guests-versions: ['main'] - circles-versions: ['master'] - notifications-versions: ['master'] - password-policy-versions: ['master'] + circles-versions: ['stable35'] + notifications-versions: ['stable35'] + password-policy-versions: ['stable35'] services: mysql: diff --git a/.github/workflows/integration-pgsql.yml b/.github/workflows/integration-pgsql.yml index 26a9c1b07a1..135d831efac 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.5'] - server-versions: ['master'] + server-versions: ['stable35'] guests-versions: ['main'] - circles-versions: ['master'] - notifications-versions: ['master'] - password-policy-versions: ['master'] + circles-versions: ['stable35'] + notifications-versions: ['stable35'] + password-policy-versions: ['stable35'] services: postgres: diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml index 70f44535e7f..ce6339d381a 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.3'] - server-versions: ['master'] + server-versions: ['stable35'] guests-versions: ['main'] - circles-versions: ['master'] - notifications-versions: ['master'] - password-policy-versions: ['master'] + circles-versions: ['stable35'] + notifications-versions: ['stable35'] + password-policy-versions: ['stable35'] steps: - name: Set app env diff --git a/.github/workflows/occ-command-documentation.yml b/.github/workflows/occ-command-documentation.yml index 310f52ccb48..262cb2dfccf 100644 --- a/.github/workflows/occ-command-documentation.yml +++ b/.github/workflows/occ-command-documentation.yml @@ -31,7 +31,7 @@ jobs: strategy: matrix: php-versions: ['8.4'] - server-versions: ['master'] + server-versions: ['stable35'] steps: - name: Set app env diff --git a/composer.json b/composer.json index 9e4d5020665..df84bbda932 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,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-stable35" }, "require": { "bamarni/composer-bin-plugin": "^1.9", diff --git a/composer.lock b/composer.lock index 90cd095ad91..c5b82dc4882 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": "d3fc96bab811db9aa63a13b619ae6f18", + "content-hash": "ead6f8b1adc0fea7172cd4c1fbd7070c", "packages": [ { "name": "bamarni/composer-bin-plugin", @@ -336,7 +336,7 @@ "packages-dev": [ { "name": "nextcloud/ocp", - "version": "dev-master", + "version": "dev-stable35", "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", @@ -360,7 +360,6 @@ "symfony/polyfill-php85": "^1.41", "symfony/polyfill-php86": "^1.41" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": {