From db97c4f3797bf20734cbd3c5ec898cfc9ffda5bb Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 31 May 2023 16:29:31 +0200 Subject: [PATCH 1/2] test: CI against doctrine/dbal 3.6.2 Signed-off-by: Joas Schilling --- .drone.jsonnet | 2 +- .drone.yml | 60 +++++++++++++++++++++++++------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index e16c161194d..d7122637d72 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -14,7 +14,7 @@ local Pipeline(test_set, database, services) = { image: "ghcr.io/nextcloud/continuous-integration-php8.2:latest", environment: { APP_NAME: "spreed", - CORE_BRANCH: "master", + CORE_BRANCH: "techdebt/noid/doctrine/dbal-to-3.6.2", GUESTS_BRANCH: "master", NOTIFICATIONS_BRANCH: "master", DATABASEHOST: database diff --git a/.drone.yml b/.drone.yml index 1953c73653c..732ace9b25e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,7 +23,7 @@ steps: - bash run.sh features/callapi environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: sqlite GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -60,7 +60,7 @@ steps: - bash run.sh features/chat environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: sqlite GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -97,7 +97,7 @@ steps: - bash run.sh features/chat-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: sqlite GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -134,7 +134,7 @@ steps: - bash run.sh features/command environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: sqlite GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -172,7 +172,7 @@ steps: - bash run.sh features/conversation environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: sqlite GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -210,7 +210,7 @@ steps: - bash run.sh features/conversation-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: sqlite GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -247,7 +247,7 @@ steps: - bash run.sh features/federation environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: sqlite GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -284,7 +284,7 @@ steps: - bash run.sh features/integration environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: sqlite GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -321,7 +321,7 @@ steps: - bash run.sh features/sharing environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: sqlite GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -358,7 +358,7 @@ steps: - bash run.sh features/sharing-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: sqlite GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -409,7 +409,7 @@ steps: - bash run.sh features/callapi environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: mysql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -460,7 +460,7 @@ steps: - bash run.sh features/chat environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: mysql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -511,7 +511,7 @@ steps: - bash run.sh features/chat-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: mysql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -562,7 +562,7 @@ steps: - bash run.sh features/command environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: mysql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -614,7 +614,7 @@ steps: - bash run.sh features/conversation environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: mysql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -666,7 +666,7 @@ steps: - bash run.sh features/conversation-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: mysql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -717,7 +717,7 @@ steps: - bash run.sh features/federation environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: mysql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -768,7 +768,7 @@ steps: - bash run.sh features/integration environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: mysql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -819,7 +819,7 @@ steps: - bash run.sh features/sharing environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: mysql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -870,7 +870,7 @@ steps: - bash run.sh features/sharing-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: mysql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -916,7 +916,7 @@ steps: - bash run.sh features/callapi environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: pgsql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -963,7 +963,7 @@ steps: - bash run.sh features/chat environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: pgsql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -1010,7 +1010,7 @@ steps: - bash run.sh features/chat-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: pgsql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -1057,7 +1057,7 @@ steps: - bash run.sh features/command environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: pgsql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -1105,7 +1105,7 @@ steps: - bash run.sh features/conversation environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: pgsql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -1153,7 +1153,7 @@ steps: - bash run.sh features/conversation-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: pgsql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -1200,7 +1200,7 @@ steps: - bash run.sh features/federation environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: pgsql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -1247,7 +1247,7 @@ steps: - bash run.sh features/integration environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: pgsql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -1294,7 +1294,7 @@ steps: - bash run.sh features/sharing environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: pgsql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master @@ -1341,7 +1341,7 @@ steps: - bash run.sh features/sharing-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: techdebt/noid/doctrine/dbal-to-3.6.2 DATABASEHOST: pgsql GUESTS_BRANCH: master NOTIFICATIONS_BRANCH: master From 18fbccf11cb626269f04e870a9b93a5140f60556 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 1 Jun 2023 10:44:32 +0200 Subject: [PATCH 2/2] Test all integration tests Signed-off-by: Joas Schilling --- .drone.jsonnet | 7 ++++--- .drone.yml | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index d7122637d72..f37f76983d2 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -47,9 +47,10 @@ local Pipeline(test_set, database, services) = { "master", "stable*" ], - event: ( - if database == "pgsql" then ["pull_request", "push"] else ["push"] - ) + event: [ + "pull_request", + "push" + ] } }; diff --git a/.drone.yml b/.drone.yml index 732ace9b25e..33bc565e5c1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -34,6 +34,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -71,6 +72,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -108,6 +110,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -145,6 +148,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -183,6 +187,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -221,6 +226,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -258,6 +264,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -295,6 +302,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -332,6 +340,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -369,6 +378,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -420,6 +430,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -471,6 +482,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -522,6 +534,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -573,6 +586,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -625,6 +639,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -677,6 +692,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -728,6 +744,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -779,6 +796,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -830,6 +848,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline @@ -881,6 +900,7 @@ trigger: - master - stable* event: + - pull_request - push --- kind: pipeline