Skip to content

Update stable22 target versions #5868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 1 commit into from
Jun 24, 2021
Merged

Update stable22 target versions #5868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/phpunit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down Expand Up @@ -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 }}

Expand Down Expand Up @@ -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 }}

Expand Down Expand Up @@ -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 }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/psalm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
ocp-version: [ 'dev-master' ]
ocp-version: [ 'dev-stable22' ]

name: Nextcloud ${{ matrix.ocp-version }}
steps:
Expand Down