Skip to content

Commit

Permalink
Merge pull request #4612 from nextcloud/backport/4324/stable20
Browse files Browse the repository at this point in the history
[stable20.1] ↕️ Split participants into 👤 Attendees and ⏳ Sessions
  • Loading branch information
nickvergessen authored Dec 9, 2020
2 parents 6a3296c + 97153c6 commit e8fc6b2
Show file tree
Hide file tree
Showing 124 changed files with 4,854 additions and 4,530 deletions.
124 changes: 124 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,41 @@ trigger:
- pull_request
- push

---
kind: pipeline
name: int-sqlite-command

steps:
- name: integration-command
image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: stable20
DATABASEHOST: sqlite
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- wget https://github.com/raw/nextcloud/travis_ci/master/before_install.sh
- bash ./before_install.sh $APP_NAME $CORE_BRANCH $DATABASEHOST
- cd ../server
- ./occ app:enable $APP_NAME
- cd apps/$APP_NAME

# Run integration tests
- cd tests/integration/
- bash run.sh features/command

services:
- name: cache
image: redis

trigger:
branch:
- master
- stable*
event:
- pull_request
- push

---
kind: pipeline
name: int-sqlite-conversation
Expand Down Expand Up @@ -613,6 +648,51 @@ trigger:
# - pull_request
- push

---
kind: pipeline
name: int-mysql-command

steps:
- name: integration-command
image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: stable20
DATABASEHOST: mysql
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- wget https://github.com/raw/nextcloud/travis_ci/master/before_install.sh
- bash ./before_install.sh $APP_NAME $CORE_BRANCH $DATABASEHOST
- cd ../server
- ./occ app:enable $APP_NAME
- cd apps/$APP_NAME

# Run integration tests
- cd tests/integration/
- bash run.sh features/command

services:
- name: cache
image: redis
- name: mysql
image: mysql:5.7.22
environment:
MYSQL_ROOT_PASSWORD: owncloud
MYSQL_USER: oc_autotest
MYSQL_PASSWORD: owncloud
MYSQL_DATABASE: oc_autotest
command: [ "--innodb_large_prefix=true", "--innodb_file_format=barracuda", "--innodb_file_per_table=true" ]
tmpfs:
- /var/lib/mysql

trigger:
branch:
- master
- stable*
event:
# - pull_request
- push

---
kind: pipeline
name: int-mysql-conversation
Expand Down Expand Up @@ -791,6 +871,50 @@ trigger:
# - pull_request
- push

---
kind: pipeline
name: int-pgsql-command

steps:
- name: integration-command
image: nextcloudci/php7.3:php7.3-5
environment:
APP_NAME: spreed
CORE_BRANCH: stable20
DATABASEHOST: pgsql
commands:
- bash tests/drone-run-integration-tests.sh || exit 0
- wget https://github.com/raw/nextcloud/travis_ci/master/before_install.sh
- bash ./before_install.sh $APP_NAME $CORE_BRANCH $DATABASEHOST
- cd ../server
- ./occ app:enable $APP_NAME
- cd apps/$APP_NAME

# Run integration tests
- cd tests/integration/
- bash run.sh features/command

services:
- name: cache
image: redis
- name: pgsql
image: postgres:10
environment:
POSTGRES_USER: oc_autotest
POSTGRES_DB: oc_autotest_dummy
POSTGRES_HOST_AUTH_METHOD: trust
POSTGRES_PASSWORD:
tmpfs:
- /var/lib/postgresql/data

trigger:
branch:
- master
- stable*
event:
# - pull_request
- push

---
kind: pipeline
name: int-pgsql-conversation
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ And in the works for the [coming versions](https://github.com/nextcloud/spreed/m
]]></description>

<version>10.0.3</version>
<version>10.1.0-dev.1</version>
<licence>agpl</licence>

<author>Daniel Calviño Sánchez</author>
Expand Down
Loading

0 comments on commit e8fc6b2

Please sign in to comment.