From 8bb48769775bd3cd33e07ff8632f8610076c98aa Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 22 Sep 2022 12:37:56 +0200 Subject: [PATCH 1/2] Adjust testing matrix for Nextcloud 25 on stable25 Signed-off-by: Joas Schilling --- .github/workflows/phpunit.yml | 8 ++++---- .github/workflows/psalm.yml | 2 +- .github/workflows/update-christophwurst-nextcloud.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index e5e1e5d7a1a..5b826c63a9a 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -30,7 +30,7 @@ jobs: matrix: php-versions: ['7.4'] databases: ['sqlite'] - server-versions: ['master'] + server-versions: ['stable25'] name: php${{ matrix.php-versions }}-${{ matrix.databases }} @@ -91,7 +91,7 @@ jobs: matrix: php-versions: ['7.4', '8.0', "8.1"] databases: ['mysql'] - server-versions: ['master'] + server-versions: ['stable25'] name: php${{ matrix.php-versions }}-${{ matrix.databases }} @@ -166,7 +166,7 @@ jobs: matrix: php-versions: ['7.4'] databases: ['pgsql'] - server-versions: ['master'] + server-versions: ['stable25'] name: php${{ matrix.php-versions }}-${{ matrix.databases }} @@ -238,7 +238,7 @@ jobs: matrix: php-versions: ['7.4'] databases: ['oci'] - server-versions: ['master'] + server-versions: ['stable25'] name: php${{ matrix.php-versions }}-${{ matrix.databases }} diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index 7248ad6e834..5833989df6b 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - ocp-version: [ 'dev-master' ] + ocp-version: [ 'dev-stable25' ] name: Nextcloud ${{ matrix.ocp-version }} steps: diff --git a/.github/workflows/update-christophwurst-nextcloud.yml b/.github/workflows/update-christophwurst-nextcloud.yml index e2e5f526fcf..50c81c6f424 100644 --- a/.github/workflows/update-christophwurst-nextcloud.yml +++ b/.github/workflows/update-christophwurst-nextcloud.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ["master", "stable24", "stable23", "stable22"] + branches: ["master", "stable25", "stable24", "stable23"] name: update-christophwurst-nextcloud-${{ matrix.branches }} From ac29c6b6d42c54a3cc0f432a323db115dcaa3ab5 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 22 Sep 2022 13:06:47 +0200 Subject: [PATCH 2/2] Adjust drone file Signed-off-by: Joas Schilling --- .drone.jsonnet | 4 +- .drone.yml | 120 ++++++++++++++++++++++++------------------------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 4e065349b04..e5f1a1b9a23 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -14,9 +14,9 @@ local Pipeline(test_set, database, services) = { image: "ghcr.io/nextcloud/continuous-integration-php8.0:latest", environment: { APP_NAME: "spreed", - CORE_BRANCH: "master", + CORE_BRANCH: "stable25", GUESTS_BRANCH: "master", - NOTIFICATIONS_BRANCH: "master", + NOTIFICATIONS_BRANCH: "stable25", DATABASEHOST: database }, commands: [ diff --git a/.drone.yml b/.drone.yml index e02e4ec7947..43a776b68bc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,10 +22,10 @@ steps: - bash run.sh features/callapi environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: sqlite GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-callapi trigger: @@ -58,10 +58,10 @@ steps: - bash run.sh features/chat environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: sqlite GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-chat trigger: @@ -94,10 +94,10 @@ steps: - bash run.sh features/command environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: sqlite GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-command trigger: @@ -131,10 +131,10 @@ steps: - bash run.sh features/conversation environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: sqlite GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-conversation trigger: @@ -168,10 +168,10 @@ steps: - bash run.sh features/conversation-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: sqlite GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-conversation-2 trigger: @@ -204,10 +204,10 @@ steps: - bash run.sh features/federation environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: sqlite GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-federation trigger: @@ -240,10 +240,10 @@ steps: - bash run.sh features/integration environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: sqlite GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-integration trigger: @@ -276,10 +276,10 @@ steps: - bash run.sh features/reaction environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: sqlite GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-reaction trigger: @@ -312,10 +312,10 @@ steps: - bash run.sh features/sharing environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: sqlite GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-sharing trigger: @@ -348,10 +348,10 @@ steps: - bash run.sh features/sharing-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: sqlite GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-sharing-2 trigger: @@ -398,10 +398,10 @@ steps: - bash run.sh features/callapi environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: mysql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-callapi trigger: @@ -449,10 +449,10 @@ steps: - bash run.sh features/chat environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: mysql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-chat trigger: @@ -500,10 +500,10 @@ steps: - bash run.sh features/command environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: mysql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-command trigger: @@ -552,10 +552,10 @@ steps: - bash run.sh features/conversation environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: mysql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-conversation trigger: @@ -604,10 +604,10 @@ steps: - bash run.sh features/conversation-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: mysql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-conversation-2 trigger: @@ -655,10 +655,10 @@ steps: - bash run.sh features/federation environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: mysql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-federation trigger: @@ -706,10 +706,10 @@ steps: - bash run.sh features/integration environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: mysql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-integration trigger: @@ -757,10 +757,10 @@ steps: - bash run.sh features/reaction environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: mysql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-reaction trigger: @@ -808,10 +808,10 @@ steps: - bash run.sh features/sharing environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: mysql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-sharing trigger: @@ -859,10 +859,10 @@ steps: - bash run.sh features/sharing-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: mysql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-sharing-2 trigger: @@ -905,10 +905,10 @@ steps: - bash run.sh features/callapi environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: pgsql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-callapi trigger: @@ -950,10 +950,10 @@ steps: - bash run.sh features/chat environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: pgsql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-chat trigger: @@ -995,10 +995,10 @@ steps: - bash run.sh features/command environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: pgsql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-command trigger: @@ -1041,10 +1041,10 @@ steps: - bash run.sh features/conversation environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: pgsql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-conversation trigger: @@ -1087,10 +1087,10 @@ steps: - bash run.sh features/conversation-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: pgsql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-conversation-2 trigger: @@ -1132,10 +1132,10 @@ steps: - bash run.sh features/federation environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: pgsql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-federation trigger: @@ -1177,10 +1177,10 @@ steps: - bash run.sh features/integration environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: pgsql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-integration trigger: @@ -1222,10 +1222,10 @@ steps: - bash run.sh features/reaction environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: pgsql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-reaction trigger: @@ -1267,10 +1267,10 @@ steps: - bash run.sh features/sharing environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: pgsql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-sharing trigger: @@ -1312,10 +1312,10 @@ steps: - bash run.sh features/sharing-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable25 DATABASEHOST: pgsql GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + NOTIFICATIONS_BRANCH: stable25 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-sharing-2 trigger: