From da6acad75e8a03a9ea72a0b480f16b9aad9eb1d4 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 28 Mar 2024 12:23:03 +0100 Subject: [PATCH 1/2] chore(CI): Adjust testing matrix for Nextcloud 29 on stable29 Signed-off-by: Joas Schilling --- composer.json | 2 +- composer.lock | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index edf16783494..b085cc5c3b1 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "test:unit": "vendor/bin/phpunit -c tests/php/phpunit.xml --colors=always --fail-on-warning --fail-on-risky" }, "require-dev": { - "nextcloud/ocp": "dev-master", + "nextcloud/ocp": "dev-stable29", "roave/security-advisories": "dev-latest" }, "require": { diff --git a/composer.lock b/composer.lock index 0a528eef881..6b6c365d837 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": "c9e484452feb71f1cca49146c9379761", + "content-hash": "c4a7eb0d66acf9a031ad6ca89646544d", "packages": [ { "name": "bamarni/composer-bin-plugin", @@ -254,16 +254,16 @@ "packages-dev": [ { "name": "nextcloud/ocp", - "version": "dev-master", + "version": "dev-stable29", "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "5da2030113ea8c39dbf5033529b86f625d2bf6fa" + "reference": "5ea8c371b46db50f79ee70e92893f6b310bc6f5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/5da2030113ea8c39dbf5033529b86f625d2bf6fa", - "reference": "5da2030113ea8c39dbf5033529b86f625d2bf6fa", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/5ea8c371b46db50f79ee70e92893f6b310bc6f5e", + "reference": "5ea8c371b46db50f79ee70e92893f6b310bc6f5e", "shasum": "" }, "require": { @@ -273,11 +273,10 @@ "psr/event-dispatcher": "^1.0", "psr/log": "^1.1.4" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-master": "29.0.0-dev" + "dev-stable29": "29.0.0-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -293,9 +292,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/stable29" }, - "time": "2024-03-21T18:32:57+00:00" + "time": "2024-03-28T10:45:57+00:00" }, { "name": "psr/clock", From a8f27c8f22e02e5aefe3b0d08916560722c53522 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 28 Mar 2024 13:16:39 +0100 Subject: [PATCH 2/2] chore(CI): Adjust server branch in more files Signed-off-by: Joas Schilling --- .github/workflows/integration-mysql.yml | 4 ++-- .github/workflows/integration-oci.yml | 4 ++-- .github/workflows/integration-pgsql.yml | 4 ++-- .github/workflows/integration-sqlite.yml | 4 ++-- .github/workflows/occ-command-documentation.yml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/integration-mysql.yml b/.github/workflows/integration-mysql.yml index 49a3cbff547..41fc104f4ef 100644 --- a/.github/workflows/integration-mysql.yml +++ b/.github/workflows/integration-mysql.yml @@ -56,10 +56,10 @@ jobs: matrix: test-suite: ['callapi', 'chat-1', 'chat-2', '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: ['stable29'] guests-versions: ['master'] call-summary-bot-versions: ['main'] - notifications-versions: ['master'] + notifications-versions: ['stable29'] services: mysql: diff --git a/.github/workflows/integration-oci.yml b/.github/workflows/integration-oci.yml index eaba42531cc..a9d6d3f57de 100644 --- a/.github/workflows/integration-oci.yml +++ b/.github/workflows/integration-oci.yml @@ -56,10 +56,10 @@ jobs: matrix: test-suite: ['callapi', 'chat-1', 'chat-2', '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: ['stable29'] guests-versions: ['master'] call-summary-bot-versions: ['main'] - notifications-versions: ['master'] + notifications-versions: ['stable29'] services: oracle: diff --git a/.github/workflows/integration-pgsql.yml b/.github/workflows/integration-pgsql.yml index 82610c9ba25..71d0b7c6f58 100644 --- a/.github/workflows/integration-pgsql.yml +++ b/.github/workflows/integration-pgsql.yml @@ -53,10 +53,10 @@ jobs: matrix: test-suite: ['callapi', 'chat-1', 'chat-2', '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: ['stable29'] guests-versions: ['master'] call-summary-bot-versions: ['main'] - notifications-versions: ['master'] + notifications-versions: ['stable29'] services: postgres: diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml index fcb28dc9376..4d18e2c0153 100644 --- a/.github/workflows/integration-sqlite.yml +++ b/.github/workflows/integration-sqlite.yml @@ -56,10 +56,10 @@ jobs: matrix: test-suite: ['callapi', 'chat-1', 'chat-2', '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: ['stable29'] guests-versions: ['master'] call-summary-bot-versions: ['main'] - notifications-versions: ['master'] + notifications-versions: ['stable29'] steps: - name: Set app env diff --git a/.github/workflows/occ-command-documentation.yml b/.github/workflows/occ-command-documentation.yml index 24a76008d4e..5193419192c 100644 --- a/.github/workflows/occ-command-documentation.yml +++ b/.github/workflows/occ-command-documentation.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: php-versions: ['8.2'] - server-versions: ['master'] + server-versions: ['stable29'] steps: - name: Set app env