From b1eb405c78968e8d61b13652c2c657dc1aeb90f0 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 14 Aug 2024 12:03:00 +0200 Subject: [PATCH] chore(CI): Adjust testing matrix for Nextcloud 30 on stable30 Signed-off-by: Joas Schilling --- .github/workflows/integration.yml | 8 ++++---- composer.json | 2 +- composer.lock | 17 ++++++++--------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index ff6e997d26..bac1d0ffa3 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -54,7 +54,7 @@ jobs: code-image: [ 'release', 'nightly' ] php-versions: ['8.1'] databases: ['sqlite'] - server-versions: ['master'] + server-versions: ['stable30'] scenarios: ['wopi', 'direct', 'federation'] name: integration-${{ matrix.code-image }}-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} @@ -126,7 +126,7 @@ jobs: matrix: php-versions: ['8.1'] databases: ['mysql'] - server-versions: ['master'] + server-versions: ['stable30'] scenarios: ['wopi', 'direct', 'federation'] name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} @@ -205,7 +205,7 @@ jobs: matrix: php-versions: ['8.1'] databases: ['pgsql'] - server-versions: ['master'] + server-versions: ['stable30'] scenarios: ['wopi', 'direct', 'federation'] name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} @@ -286,7 +286,7 @@ jobs: matrix: php-versions: ['8.1'] databases: ['oci'] - server-versions: ['master'] + server-versions: ['stable30'] scenarios: ['wopi', 'direct', 'federation'] name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} diff --git a/composer.json b/composer.json index 1627d038df..7da3c52596 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "psalm/phar": "^5.3", "friendsofphp/php-cs-fixer": "^3.8", "nextcloud/coding-standard": "^1.0", - "nextcloud/ocp": "dev-master", + "nextcloud/ocp": "dev-stable30", "phpunit/phpunit": "^9.5" }, "license": "AGPLv3", diff --git a/composer.lock b/composer.lock index 4e5802adbd..31c5064b94 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": "f118a358162577fab7ee75cad4ef1383", + "content-hash": "617fdc6d05ba46bae40251a9bf668377", "packages": [], "packages-dev": [ { @@ -232,16 +232,16 @@ }, { "name": "nextcloud/ocp", - "version": "dev-master", + "version": "dev-stable30", "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "fb567bbfffc34cdd48efd19990b6b452c2eea6eb" + "reference": "2a005250064759f206aa1b5a1ee000dcd808ef5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/fb567bbfffc34cdd48efd19990b6b452c2eea6eb", - "reference": "fb567bbfffc34cdd48efd19990b6b452c2eea6eb", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/2a005250064759f206aa1b5a1ee000dcd808ef5b", + "reference": "2a005250064759f206aa1b5a1ee000dcd808ef5b", "shasum": "" }, "require": { @@ -251,11 +251,10 @@ "psr/event-dispatcher": "^1.0", "psr/log": "^1.1.4" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-master": "30.0.0-dev" + "dev-stable30": "30.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/stable30" }, - "time": "2024-08-03T00:37:02+00:00" + "time": "2024-08-14T08:51:38+00:00" }, { "name": "nikic/php-parser",