From b89181b4824410a2a10779c7406f4f79657a731d Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 14 Apr 2022 22:24:03 +0200 Subject: [PATCH] Update stable24 target versions Signed-off-by: Joas Schilling --- .drone.jsonnet | 6 +- .drone.yml | 162 +++++++++++++++++----------------- .github/workflows/phpunit.yml | 8 +- .github/workflows/psalm.yml | 2 +- 4 files changed, 89 insertions(+), 89 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 9920a39f547..9b0730a836b 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", - GUESTS_BRANCH: "master", - NOTIFICATIONS_BRANCH: "master", + CORE_BRANCH: "stable24", + GUESTS_BRANCH: "stable24", + NOTIFICATIONS_BRANCH: "stable24", DATABASEHOST: database }, commands: [ diff --git a/.drone.yml b/.drone.yml index b20111fc060..39c1e0bb365 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,10 +19,10 @@ steps: - bash run.sh features/callapi environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: sqlite - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-callapi trigger: @@ -52,10 +52,10 @@ steps: - bash run.sh features/chat environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: sqlite - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-chat trigger: @@ -85,10 +85,10 @@ steps: - bash run.sh features/command environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: sqlite - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-command trigger: @@ -119,10 +119,10 @@ steps: - bash run.sh features/conversation environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: sqlite - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-conversation trigger: @@ -153,10 +153,10 @@ steps: - bash run.sh features/conversation-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: sqlite - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-conversation-2 trigger: @@ -186,10 +186,10 @@ steps: - bash run.sh features/federation environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: sqlite - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-federation trigger: @@ -219,10 +219,10 @@ steps: - bash run.sh features/reaction environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: sqlite - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-reaction trigger: @@ -252,10 +252,10 @@ steps: - bash run.sh features/sharing environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: sqlite - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-sharing trigger: @@ -285,10 +285,10 @@ steps: - bash run.sh features/sharing-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: sqlite - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-sharing-2 trigger: @@ -332,10 +332,10 @@ steps: - bash run.sh features/callapi environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: mysql - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-callapi trigger: @@ -380,10 +380,10 @@ steps: - bash run.sh features/chat environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: mysql - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-chat trigger: @@ -428,10 +428,10 @@ steps: - bash run.sh features/command environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: mysql - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-command trigger: @@ -477,10 +477,10 @@ steps: - bash run.sh features/conversation environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: mysql - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-conversation trigger: @@ -526,10 +526,10 @@ steps: - bash run.sh features/conversation-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: mysql - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-conversation-2 trigger: @@ -574,10 +574,10 @@ steps: - bash run.sh features/federation environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: mysql - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-federation trigger: @@ -622,10 +622,10 @@ steps: - bash run.sh features/reaction environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: mysql - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-reaction trigger: @@ -670,10 +670,10 @@ steps: - bash run.sh features/sharing environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: mysql - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-sharing trigger: @@ -718,10 +718,10 @@ steps: - bash run.sh features/sharing-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: mysql - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-sharing-2 trigger: @@ -761,10 +761,10 @@ steps: - bash run.sh features/callapi environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: pgsql - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-callapi trigger: @@ -803,10 +803,10 @@ steps: - bash run.sh features/chat environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: pgsql - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-chat trigger: @@ -845,10 +845,10 @@ steps: - bash run.sh features/command environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: pgsql - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-command trigger: @@ -888,10 +888,10 @@ steps: - bash run.sh features/conversation environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: pgsql - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-conversation trigger: @@ -931,10 +931,10 @@ steps: - bash run.sh features/conversation-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: pgsql - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-conversation-2 trigger: @@ -973,10 +973,10 @@ steps: - bash run.sh features/federation environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: pgsql - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-federation trigger: @@ -1015,10 +1015,10 @@ steps: - bash run.sh features/reaction environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: pgsql - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-reaction trigger: @@ -1057,10 +1057,10 @@ steps: - bash run.sh features/sharing environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: pgsql - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-sharing trigger: @@ -1099,10 +1099,10 @@ steps: - bash run.sh features/sharing-2 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable24 DATABASEHOST: pgsql - GUESTS_BRANCH: master - NOTIFICATIONS_BRANCH: master + GUESTS_BRANCH: stable24 + NOTIFICATIONS_BRANCH: stable24 image: ghcr.io/nextcloud/continuous-integration-php8.0:latest name: integration-sharing-2 trigger: diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 5cc6a080ed8..b7613e42cb8 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -27,7 +27,7 @@ jobs: matrix: php-versions: ['7.4'] databases: ['sqlite'] - server-versions: ['master'] + server-versions: ['stable24'] name: php${{ matrix.php-versions }}-${{ matrix.databases }} @@ -89,7 +89,7 @@ jobs: matrix: php-versions: ['7.4', '8.0', "8.1"] databases: ['mysql'] - server-versions: ['master'] + server-versions: ['stable24'] name: php${{ matrix.php-versions }}-${{ matrix.databases }} @@ -165,7 +165,7 @@ jobs: matrix: php-versions: ['7.4'] databases: ['pgsql'] - server-versions: ['master'] + server-versions: ['stable24'] name: php${{ matrix.php-versions }}-${{ matrix.databases }} @@ -238,7 +238,7 @@ jobs: matrix: php-versions: ['7.4'] databases: ['oci'] - server-versions: ['master'] + server-versions: ['stable24'] name: php${{ matrix.php-versions }}-${{ matrix.databases }} diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index 7248ad6e834..bf8d6e46db9 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-stable24' ] name: Nextcloud ${{ matrix.ocp-version }} steps: