diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 4a52273c5b..c2f6044899 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -28,7 +28,7 @@ jobs: containers: [1, 2, 3, 4, 5] php-versions: [ '8.0' ] databases: [ 'sqlite' ] - server-versions: [ 'master' ] + server-versions: [ 'stable28' ] name: runner ${{ matrix.containers }} diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index c98c30c8e9..d12fc88971 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -51,7 +51,7 @@ jobs: matrix: php-versions: ['8.0'] databases: ['sqlite'] - server-versions: ['master'] + server-versions: ['stable28'] scenarios: ['wopi', 'direct', 'federation'] name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} @@ -123,7 +123,7 @@ jobs: matrix: php-versions: ['8.0'] databases: ['mysql'] - server-versions: ['master'] + server-versions: ['stable28'] scenarios: ['wopi', 'direct', 'federation'] name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} @@ -202,7 +202,7 @@ jobs: matrix: php-versions: ['8.0'] databases: ['pgsql'] - server-versions: ['master'] + server-versions: ['stable28'] scenarios: ['wopi', 'direct', 'federation'] name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} @@ -283,7 +283,7 @@ jobs: matrix: php-versions: ['8.0'] databases: ['oci'] - server-versions: ['master'] + server-versions: ['stable28'] scenarios: ['wopi', 'direct', 'federation'] name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml index 151351d569..91f457cef1 100644 --- a/.github/workflows/phpunit-mysql.yml +++ b/.github/workflows/phpunit-mysql.yml @@ -54,7 +54,7 @@ jobs: strategy: matrix: php-versions: ['8.0', '8.1', '8.2', '8.3'] - server-versions: ['master'] + server-versions: ['stable28'] services: mysql: diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml index 2b5eb29006..ada3cba5c4 100644 --- a/.github/workflows/phpunit-oci.yml +++ b/.github/workflows/phpunit-oci.yml @@ -54,7 +54,7 @@ jobs: strategy: matrix: php-versions: ['8.0'] - server-versions: ['master'] + server-versions: ['stable28'] services: oracle: diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml index 90724d59ba..5a4e1b322d 100644 --- a/.github/workflows/phpunit-pgsql.yml +++ b/.github/workflows/phpunit-pgsql.yml @@ -54,7 +54,7 @@ jobs: strategy: matrix: php-versions: ['8.0'] - server-versions: ['master'] + server-versions: ['stable28'] services: postgres: diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index d357f6473d..64692ba684 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -54,7 +54,7 @@ jobs: strategy: matrix: php-versions: ['8.0'] - server-versions: ['master'] + server-versions: ['stable28'] steps: - name: Set app env diff --git a/composer.json b/composer.json index 16fd823873..fb4b43f711 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "psalm/phar": "^5.3", "friendsofphp/php-cs-fixer": "^3.8", "nextcloud/coding-standard": "^1.0", - "nextcloud/ocp": "dev-master", + "nextcloud/ocp": "dev-stable28", "phpunit/phpunit": "^9.5" }, "license": "AGPLv3", diff --git a/composer.lock b/composer.lock index 3e24a6c2d6..acd7d42239 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": "3570445a6dfdadab1334881859a810ea", + "content-hash": "650c94318e59b6b1bd4cc249ab7fe594", "packages": [], "packages-dev": [ { @@ -232,30 +232,29 @@ }, { "name": "nextcloud/ocp", - "version": "dev-master", + "version": "dev-stable28", "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "488e4ad136853e5b24efa745e941c785cf41c51e" + "reference": "2ac04202af2904a000d3e4090f7def301a4cecfe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/488e4ad136853e5b24efa745e941c785cf41c51e", - "reference": "488e4ad136853e5b24efa745e941c785cf41c51e", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/2ac04202af2904a000d3e4090f7def301a4cecfe", + "reference": "2ac04202af2904a000d3e4090f7def301a4cecfe", "shasum": "" }, "require": { - "php": "~8.0 || ~8.1 || ~8.2", + "php": "~8.0 || ~8.1 || ~8.2 || ~8.3", "psr/clock": "^1.0", "psr/container": "^2.0.2", "psr/event-dispatcher": "^1.0", "psr/log": "^1.1.4" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-master": "28.0.0-dev" + "dev-stable28": "28.0.0-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -271,9 +270,9 @@ "description": "Composer package containing Nextcloud's public API (classes, interfaces)", "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/stable28" }, - "time": "2023-11-18T00:32:35+00:00" + "time": "2023-11-23T10:57:48+00:00" }, { "name": "nikic/php-parser",