summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.drone.jsonnet6
-rw-r--r--.drone.yml180
-rw-r--r--.github/workflows/phpunit-mysql.yml2
-rw-r--r--.github/workflows/phpunit-oci.yml2
-rw-r--r--.github/workflows/phpunit-pgsql.yml2
-rw-r--r--.github/workflows/phpunit-sqlite.yml2
-rw-r--r--composer.json2
-rw-r--r--composer.lock13
8 files changed, 104 insertions, 105 deletions
diff --git a/.drone.jsonnet b/.drone.jsonnet
index e16c16119..21240b863 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -14,9 +14,9 @@ local Pipeline(test_set, database, services) = {
image: "ghcr.io/nextcloud/continuous-integration-php8.2:latest",
environment: {
APP_NAME: "spreed",
- CORE_BRANCH: "master",
- GUESTS_BRANCH: "master",
- NOTIFICATIONS_BRANCH: "master",
+ CORE_BRANCH: "stable27",
+ GUESTS_BRANCH: "stable27",
+ NOTIFICATIONS_BRANCH: "stable27",
DATABASEHOST: database
},
commands: [
diff --git a/.drone.yml b/.drone.yml
index 1953c7365..762a38ac5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,10 +23,10 @@ steps:
- bash run.sh features/callapi
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: sqlite
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-callapi
trigger:
@@ -60,10 +60,10 @@ steps:
- bash run.sh features/chat
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: sqlite
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-chat
trigger:
@@ -97,10 +97,10 @@ steps:
- bash run.sh features/chat-2
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: sqlite
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-chat-2
trigger:
@@ -134,10 +134,10 @@ steps:
- bash run.sh features/command
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: sqlite
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-command
trigger:
@@ -172,10 +172,10 @@ steps:
- bash run.sh features/conversation
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: sqlite
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-conversation
trigger:
@@ -210,10 +210,10 @@ steps:
- bash run.sh features/conversation-2
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: sqlite
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-conversation-2
trigger:
@@ -247,10 +247,10 @@ steps:
- bash run.sh features/federation
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: sqlite
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-federation
trigger:
@@ -284,10 +284,10 @@ steps:
- bash run.sh features/integration
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: sqlite
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-integration
trigger:
@@ -321,10 +321,10 @@ steps:
- bash run.sh features/sharing
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: sqlite
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-sharing
trigger:
@@ -358,10 +358,10 @@ steps:
- bash run.sh features/sharing-2
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: sqlite
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-sharing-2
trigger:
@@ -409,10 +409,10 @@ steps:
- bash run.sh features/callapi
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: mysql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-callapi
trigger:
@@ -460,10 +460,10 @@ steps:
- bash run.sh features/chat
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: mysql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-chat
trigger:
@@ -511,10 +511,10 @@ steps:
- bash run.sh features/chat-2
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: mysql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-chat-2
trigger:
@@ -562,10 +562,10 @@ steps:
- bash run.sh features/command
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: mysql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-command
trigger:
@@ -614,10 +614,10 @@ steps:
- bash run.sh features/conversation
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: mysql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-conversation
trigger:
@@ -666,10 +666,10 @@ steps:
- bash run.sh features/conversation-2
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: mysql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-conversation-2
trigger:
@@ -717,10 +717,10 @@ steps:
- bash run.sh features/federation
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: mysql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-federation
trigger:
@@ -768,10 +768,10 @@ steps:
- bash run.sh features/integration
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: mysql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-integration
trigger:
@@ -819,10 +819,10 @@ steps:
- bash run.sh features/sharing
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: mysql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-sharing
trigger:
@@ -870,10 +870,10 @@ steps:
- bash run.sh features/sharing-2
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: mysql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-sharing-2
trigger:
@@ -916,10 +916,10 @@ steps:
- bash run.sh features/callapi
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: pgsql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-callapi
trigger:
@@ -963,10 +963,10 @@ steps:
- bash run.sh features/chat
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: pgsql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-chat
trigger:
@@ -1010,10 +1010,10 @@ steps:
- bash run.sh features/chat-2
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: pgsql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-chat-2
trigger:
@@ -1057,10 +1057,10 @@ steps:
- bash run.sh features/command
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: pgsql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-command
trigger:
@@ -1105,10 +1105,10 @@ steps:
- bash run.sh features/conversation
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: pgsql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-conversation
trigger:
@@ -1153,10 +1153,10 @@ steps:
- bash run.sh features/conversation-2
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: pgsql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-conversation-2
trigger:
@@ -1200,10 +1200,10 @@ steps:
- bash run.sh features/federation
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: pgsql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-federation
trigger:
@@ -1247,10 +1247,10 @@ steps:
- bash run.sh features/integration
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: pgsql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-integration
trigger:
@@ -1294,10 +1294,10 @@ steps:
- bash run.sh features/sharing
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: pgsql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-sharing
trigger:
@@ -1341,10 +1341,10 @@ steps:
- bash run.sh features/sharing-2
environment:
APP_NAME: spreed
- CORE_BRANCH: master
+ CORE_BRANCH: stable27
DATABASEHOST: pgsql
- GUESTS_BRANCH: master
- NOTIFICATIONS_BRANCH: master
+ GUESTS_BRANCH: stable27
+ NOTIFICATIONS_BRANCH: stable27
image: ghcr.io/nextcloud/continuous-integration-php8.2:latest
name: integration-sharing-2
trigger:
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
index 6508c8b78..4d11518d7 100644
--- a/.github/workflows/phpunit-mysql.yml
+++ b/.github/workflows/phpunit-mysql.yml
@@ -39,7 +39,7 @@ jobs:
strategy:
matrix:
php-versions: ['8.0', '8.1', '8.2']
- server-versions: ['master']
+ server-versions: ['stable27']
services:
mysql:
diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
index 9424f7d26..21fab4272 100644
--- a/.github/workflows/phpunit-oci.yml
+++ b/.github/workflows/phpunit-oci.yml
@@ -39,7 +39,7 @@ jobs:
strategy:
matrix:
php-versions: ['8.0']
- server-versions: ['master']
+ server-versions: ['stable27']
services:
oracle:
diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
index 16a470ad8..83ca7fd13 100644
--- a/.github/workflows/phpunit-pgsql.yml
+++ b/.github/workflows/phpunit-pgsql.yml
@@ -39,7 +39,7 @@ jobs:
strategy:
matrix:
php-versions: ['8.0']
- server-versions: ['master']
+ server-versions: ['stable27']
services:
postgres:
diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
index 5a17f4ea9..774094fe8 100644
--- a/.github/workflows/phpunit-sqlite.yml
+++ b/.github/workflows/phpunit-sqlite.yml
@@ -39,7 +39,7 @@ jobs:
strategy:
matrix:
php-versions: ['8.0']
- server-versions: ['master']
+ server-versions: ['stable27']
steps:
- name: Set app env
diff --git a/composer.json b/composer.json
index 367f18fd6..e8fdabaac 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,7 @@
"test:unit": "vendor/bin/phpunit -c tests/php/phpunit.xml --color --fail-on-warning --fail-on-risky"
},
"require-dev": {
- "nextcloud/ocp": "dev-master",
+ "nextcloud/ocp": "dev-stable27",
"roave/security-advisories": "dev-latest"
},
"require": {
diff --git a/composer.lock b/composer.lock
index 18cacc412..1c5e74a24 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": "00f4e9acdbfeeb58e42d0b212571e328",
+ "content-hash": "80070ecc428b8ce3164380c161b609cf",
"packages": [
{
"name": "bamarni/composer-bin-plugin",
@@ -130,16 +130,16 @@
"packages-dev": [
{
"name": "nextcloud/ocp",
- "version": "dev-master",
+ "version": "dev-stable27",
"source": {
"type": "git",
"url": "https://github.com/nextcloud-deps/ocp.git",
- "reference": "baf13f74c7bad9e134b8b95fbea945d5bee1d98d"
+ "reference": "92f707dc8f36a76ddfed4d52d999d672613a4748"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/baf13f74c7bad9e134b8b95fbea945d5bee1d98d",
- "reference": "baf13f74c7bad9e134b8b95fbea945d5bee1d98d",
+ "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/92f707dc8f36a76ddfed4d52d999d672613a4748",
+ "reference": "92f707dc8f36a76ddfed4d52d999d672613a4748",
"shasum": ""
},
"require": {
@@ -149,7 +149,6 @@
"psr/event-dispatcher": "^1.0",
"psr/log": "^1.1"
},
- "default-branch": true,
"type": "library",
"extra": {
"branch-alias": {
@@ -171,7 +170,7 @@
"issues": "https://github.com/nextcloud-deps/ocp/issues",
"source": "https://github.com/nextcloud-deps/ocp/tree/master"
},
- "time": "2023-05-13T00:33:05+00:00"
+ "time": "2023-05-17T10:58:24+00:00"
},
{
"name": "psr/clock",