diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 0d8a7528dd..3e7b669d90 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -57,7 +57,7 @@ jobs: code-image: [ 'release', 'nightly' ] php-versions: ['8.2'] databases: ['sqlite'] - server-versions: ['master'] + server-versions: ['stable34'] scenarios: ['wopi', 'direct', 'federation', 'api', 'secure-view', 'admin-settings'] name: integration-${{ matrix.code-image }}-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} @@ -125,7 +125,7 @@ jobs: matrix: php-versions: ['8.2'] databases: ['mysql'] - server-versions: ['master'] + server-versions: ['stable34'] scenarios: ['wopi', 'direct', 'federation', 'api', 'secure-view', 'admin-settings'] name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} @@ -200,7 +200,7 @@ jobs: matrix: php-versions: ['8.2'] databases: ['pgsql'] - server-versions: ['master'] + server-versions: ['stable34'] scenarios: ['wopi', 'direct', 'federation', 'api', 'secure-view', 'admin-settings'] name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} @@ -277,7 +277,7 @@ jobs: matrix: php-versions: ['8.2'] databases: ['oci'] - server-versions: ['master'] + server-versions: ['stable34'] scenarios: ['wopi', 'direct', 'federation', 'api', 'secure-view', 'admin-settings'] name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} diff --git a/composer.json b/composer.json index 4baebeeda5..ee44e70c1a 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "psalm/phar": "^6.16", "friendsofphp/php-cs-fixer": "^3.8", "nextcloud/coding-standard": "^1.4", - "nextcloud/ocp": "dev-master", + "nextcloud/ocp": "dev-stable34", "phpunit/phpunit": "^9.6", "bamarni/composer-bin-plugin": "^1.9" }, diff --git a/composer.lock b/composer.lock index 49f4fba57b..a09064f8e6 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": "e759d10e456ec9f39cb4838027fbd00f", + "content-hash": "b1db03e31cd8b17203e8246bf9a88300", "packages": [ { "name": "dflydev/dot-access-data", @@ -1344,16 +1344,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": { @@ -1364,11 +1364,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/", @@ -1388,9 +1387,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",