Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions .github/workflows/integration-federation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ jobs:
- test-suite: 'federation'
php-versions: '8.2'
host-db: 'oci'
host-server-versions: 'master'
host-server-versions: 'stable34'
host-spreed-versions: ${{ github.event.pull_request.head.sha }}
host-guests-versions: 'main'
host-circles-versions: 'master'
host-notifications-versions: 'master'
host-circles-versions: 'stable34'
host-notifications-versions: 'stable34'
remote-db: 'mysql'
remote-server-versions: 'stable33'
remote-spreed-versions: 'stable33'
Expand All @@ -68,11 +68,11 @@ jobs:
- test-suite: 'federation'
php-versions: '8.2'
host-db: 'pgsql'
host-server-versions: 'master'
host-server-versions: 'stable34'
host-spreed-versions: ${{ github.event.pull_request.head.sha }}
host-guests-versions: 'main'
host-circles-versions: 'master'
host-notifications-versions: 'master'
host-circles-versions: 'stable34'
host-notifications-versions: 'stable34'
remote-db: 'mysql'
remote-server-versions: 'stable33'
remote-spreed-versions: 'stable33'
Expand All @@ -88,11 +88,11 @@ jobs:
host-circles-versions: 'stable33'
host-notifications-versions: 'stable33'
remote-db: 'mysql'
remote-server-versions: 'master'
remote-server-versions: 'stable34'
remote-spreed-versions: ${{ github.event.pull_request.head.sha }}
remote-guests-versions: 'main'
remote-circles-versions: 'master'
remote-notifications-versions: 'master'
remote-circles-versions: 'stable34'
remote-notifications-versions: 'stable34'

services:
oracle:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/integration-mariadb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ jobs:
matrix:
test-suite: ['callapi', 'chat-1', 'chat-2', 'chat-3', 'chat-4', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
php-versions: ['8.2']
server-versions: ['master']
server-versions: ['stable34']
guests-versions: ['main']
circles-versions: ['master']
notifications-versions: ['master']
password-policy-versions: ['master']
circles-versions: ['stable34']
notifications-versions: ['stable34']
password-policy-versions: ['stable34']

services:
mariadb:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/integration-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ jobs:
matrix:
test-suite: ['callapi', 'chat-1', 'chat-2', 'chat-3', 'chat-4', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
php-versions: ['8.2']
server-versions: ['master']
server-versions: ['stable34']
guests-versions: ['main']
circles-versions: ['master']
notifications-versions: ['master']
password-policy-versions: ['master']
circles-versions: ['stable34']
notifications-versions: ['stable34']
password-policy-versions: ['stable34']

services:
mysql:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/integration-oci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ jobs:
matrix:
test-suite: ['callapi', 'chat-1', 'chat-2', 'chat-3', 'chat-4', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
php-versions: ['8.2']
server-versions: ['master']
server-versions: ['stable34']
guests-versions: ['main']
circles-versions: ['master']
notifications-versions: ['master']
password-policy-versions: ['master']
circles-versions: ['stable34']
notifications-versions: ['stable34']
password-policy-versions: ['stable34']

services:
oracle:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/integration-pgsql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ jobs:
- 'sharing-3'
- 'sharing-4'
php-versions: ['8.3']
server-versions: ['master']
server-versions: ['stable34']
guests-versions: ['main']
circles-versions: ['master']
notifications-versions: ['master']
password-policy-versions: ['master']
circles-versions: ['stable34']
notifications-versions: ['stable34']
password-policy-versions: ['stable34']

services:
postgres:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/integration-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ jobs:
matrix:
test-suite: ['callapi', 'chat-1', 'chat-2', 'chat-3', 'chat-4', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
php-versions: ['8.2']
server-versions: ['master']
server-versions: ['stable34']
guests-versions: ['main']
circles-versions: ['master']
notifications-versions: ['master']
password-policy-versions: ['master']
circles-versions: ['stable34']
notifications-versions: ['stable34']
password-policy-versions: ['stable34']

steps:
- name: Set app env
Expand Down
32 changes: 21 additions & 11 deletions .github/workflows/occ-command-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,8 @@ on:
pull_request:
paths:
- '.github/workflows/**'
- 'appinfo/**'
- 'lib/**'
- 'templates/**'
- 'tests/**'
- 'vendor/**'
- 'vendor-bin/**'
- '.php-cs-fixer.dist.php'
- 'composer.json'
- 'composer.lock'
- 'docs/commands.md'
- 'lib/Command/**'

permissions:
contents: read
Expand All @@ -25,13 +18,30 @@ concurrency:
cancel-in-progress: true

jobs:
matrix:
runs-on: ubuntu-latest-low
outputs:
php-version: ${{ steps.versions.outputs.php-available-list }}
server-max: ${{ steps.versions.outputs.branches-max-list }}
steps:
- name: Checkout app
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
persist-credentials: false

- name: Get version matrix
id: versions
uses: icewind1991/nextcloud-version-matrix@8a7bac6300b2f0f3100088b297995a229558ddba # v1.3.2

occ-commands:
runs-on: ubuntu-latest

needs: [matrix]

strategy:
matrix:
php-versions: ['8.2']
server-versions: ['master']
php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}

steps:
- name: Set app env
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"test:unit": "vendor/bin/phpunit -c tests/php/phpunit.xml --colors=always --fail-on-warning --fail-on-risky --display-deprecations --display-phpunit-deprecations"
},
"require-dev": {
"nextcloud/ocp": "dev-master"
"nextcloud/ocp": "dev-stable34"
},
"require": {
"bamarni/composer-bin-plugin": "^1.9",
Expand Down
17 changes: 8 additions & 9 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions tests/integration/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
PROCESS_ID=$$

APP_NAME=spreed
NOTIFICATIONS_BRANCH="master"
NOTIFICATIONS_BRANCH="stable34"
GUESTS_BRANCH="main"
CIRCLES_BRANCH="master"
PASSWORD_POLICY_BRANCH="master"
CIRCLES_BRANCH="stable34"
PASSWORD_POLICY_BRANCH="stable34"

APP_INTEGRATION_DIR=$PWD
ROOT_DIR=${APP_INTEGRATION_DIR}/../../../..
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/talk_webhook_demo/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<summary><![CDATA[Copy of old "Call summary bot"]]></summary>
<description><![CDATA[Version of the call summary bot before it was migrated to the new events]]></description>

<version>23.0.0</version>
<version>24.0.0</version>
<licence>agpl</licence>

<author>Joas Schilling</author>
Expand All @@ -19,7 +19,7 @@
<bugs>https://github.com/nextcloud/spreed/issues</bugs>

<dependencies>
<nextcloud min-version="33" max-version="33" />
<nextcloud min-version="34" max-version="34" />
</dependencies>

<repair-steps>
Expand Down
Loading