diff options
author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2021-06-24 17:23:54 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-24 17:23:54 +0300 |
commit | 83dd6f2a00fded754a6584e09035556727dfbd76 (patch) | |
tree | 87702fdfc27051aa06364582cf33dc36f810d604 | |
parent | f84d4960ec131ad779e70a79bb4370b60b82c426 (diff) | |
parent | 005976fc52739b10c706ecd1c2667b5510368630 (diff) |
Merge pull request #5868 from nextcloud/update-stable22-target-versions
Update stable22 target versions
-rw-r--r-- | .drone.yml | 58 | ||||
-rw-r--r-- | .github/workflows/phpunit.yml | 8 | ||||
-rw-r--r-- | .github/workflows/psalm.yml | 2 |
3 files changed, 34 insertions, 34 deletions
diff --git a/.drone.yml b/.drone.yml index 0157e3d63..f8016aa86 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,7 +6,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 DATABASEHOST: sqlite commands: - bash tests/drone-run-integration-tests.sh || exit 0 @@ -41,7 +41,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 DATABASEHOST: sqlite commands: - bash tests/drone-run-integration-tests.sh || exit 0 @@ -76,7 +76,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 DATABASEHOST: sqlite commands: - bash tests/drone-run-integration-tests.sh || exit 0 @@ -111,7 +111,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 GUESTS_BRANCH: master DATABASEHOST: sqlite commands: @@ -148,7 +148,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 GUESTS_BRANCH: master DATABASEHOST: sqlite commands: @@ -185,7 +185,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 DATABASEHOST: sqlite commands: - bash tests/drone-run-integration-tests.sh || exit 0 @@ -220,7 +220,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 DATABASEHOST: sqlite commands: - bash tests/drone-run-integration-tests.sh || exit 0 @@ -255,7 +255,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 DATABASEHOST: mysql commands: - bash tests/drone-run-integration-tests.sh || exit 0 @@ -300,7 +300,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 DATABASEHOST: mysql commands: - bash tests/drone-run-integration-tests.sh || exit 0 @@ -345,7 +345,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 DATABASEHOST: mysql commands: - bash tests/drone-run-integration-tests.sh || exit 0 @@ -390,7 +390,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 GUESTS_BRANCH: master DATABASEHOST: mysql commands: @@ -437,7 +437,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 GUESTS_BRANCH: master DATABASEHOST: mysql commands: @@ -484,7 +484,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 DATABASEHOST: mysql commands: - bash tests/drone-run-integration-tests.sh || exit 0 @@ -529,7 +529,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 DATABASEHOST: mysql commands: - bash tests/drone-run-integration-tests.sh || exit 0 @@ -574,7 +574,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 DATABASEHOST: pgsql commands: - bash tests/drone-run-integration-tests.sh || exit 0 @@ -618,7 +618,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 DATABASEHOST: pgsql commands: - bash tests/drone-run-integration-tests.sh || exit 0 @@ -662,7 +662,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 DATABASEHOST: pgsql commands: - bash tests/drone-run-integration-tests.sh || exit 0 @@ -706,7 +706,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 GUESTS_BRANCH: master DATABASEHOST: pgsql commands: @@ -752,7 +752,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 GUESTS_BRANCH: master DATABASEHOST: pgsql commands: @@ -798,7 +798,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 DATABASEHOST: pgsql commands: - bash tests/drone-run-integration-tests.sh || exit 0 @@ -842,7 +842,7 @@ steps: image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 environment: APP_NAME: spreed - CORE_BRANCH: master + CORE_BRANCH: stable22 DATABASEHOST: pgsql commands: - bash tests/drone-run-integration-tests.sh || exit 0 @@ -886,7 +886,7 @@ trigger: # image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2 # environment: # APP_NAME: spreed -# CORE_BRANCH: master +# CORE_BRANCH: stable22 # SELENIUM_HOST: selenium # TESTS_ACCEPTANCE: app-files # commands: @@ -926,7 +926,7 @@ trigger: # image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2 # environment: # APP_NAME: spreed -# CORE_BRANCH: master +# CORE_BRANCH: stable22 # SELENIUM_HOST: selenium # TESTS_ACCEPTANCE: chat # commands: @@ -968,7 +968,7 @@ trigger: # image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2 # environment: # APP_NAME: spreed -# CORE_BRANCH: master +# CORE_BRANCH: stable22 # SELENIUM_HOST: selenium # TESTS_ACCEPTANCE: conversation # commands: @@ -1010,7 +1010,7 @@ trigger: # image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2 # environment: # APP_NAME: spreed -# CORE_BRANCH: master +# CORE_BRANCH: stable22 # SELENIUM_HOST: selenium # TESTS_ACCEPTANCE: conversation-public # commands: @@ -1052,7 +1052,7 @@ trigger: # image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2 # environment: # APP_NAME: spreed -# CORE_BRANCH: master +# CORE_BRANCH: stable22 # SELENIUM_HOST: selenium # TESTS_ACCEPTANCE: lobby # commands: @@ -1092,7 +1092,7 @@ trigger: # image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2 # environment: # APP_NAME: spreed -# CORE_BRANCH: master +# CORE_BRANCH: stable22 # SELENIUM_HOST: selenium # TESTS_ACCEPTANCE: public-share # commands: @@ -1134,7 +1134,7 @@ trigger: # image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2 # environment: # APP_NAME: spreed -# CORE_BRANCH: master +# CORE_BRANCH: stable22 # SELENIUM_HOST: selenium # TESTS_ACCEPTANCE: public-share-auth # commands: @@ -1176,7 +1176,7 @@ trigger: # image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2 # environment: # APP_NAME: spreed -# CORE_BRANCH: master +# CORE_BRANCH: stable22 # SELENIUM_HOST: selenium # TESTS_ACCEPTANCE: room-shares # commands: diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 1dc8ec33b..58dfc5d0a 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -20,7 +20,7 @@ jobs: matrix: php-versions: ['7.4'] databases: ['sqlite'] - server-versions: ['master'] + server-versions: ['stable22'] name: php${{ matrix.php-versions }}-${{ matrix.databases }} @@ -82,7 +82,7 @@ jobs: matrix: php-versions: ['7.3', '7.4'] databases: ['mysql'] - server-versions: ['master'] + server-versions: ['stable22'] name: php${{ matrix.php-versions }}-${{ matrix.databases }} @@ -153,7 +153,7 @@ jobs: matrix: php-versions: ['7.4'] databases: ['pgsql'] - server-versions: ['master'] + server-versions: ['stable22'] name: php${{ matrix.php-versions }}-${{ matrix.databases }} @@ -226,7 +226,7 @@ jobs: matrix: php-versions: ['7.4'] databases: ['oci'] - server-versions: ['master'] + server-versions: ['stable22'] name: php${{ matrix.php-versions }}-${{ matrix.databases }} diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index 7248ad6e8..e756efe15 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-stable22' ] name: Nextcloud ${{ matrix.ocp-version }} steps: |