Merge branch 'master' into dependabot/npm_and_yarn/serialize-javascript-6.0.2

pull/337/head
Sébastien Marinier 2025-05-16 17:15:37 +02:00 committed by GitHub
commit bdb67467ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 11 deletions

View File

@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
php-versions: [8.0, 8.1, 8.2] php-versions: [8.1, 8.2, 8.3]
name: php${{ matrix.php-versions }} lint name: php${{ matrix.php-versions }} lint
steps: steps:
- name: Checkout - name: Checkout

View File

@ -11,11 +11,8 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
php-versions: ['8.0', '8.1', '8.2'] php-versions: ['8.1', '8.2', '8.3']
nextcloud-versions: ['stable29', 'stable30'] nextcloud-versions: ['stable29', 'stable30', 'stable31']
exclude:
- php-versions: '8.0'
nextcloud-versions: 'stable30'
name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests
env: env:
CI: true CI: true
@ -37,7 +34,7 @@ jobs:
path: nextcloud/apps/bbb path: nextcloud/apps/bbb
- name: Update test stub - name: Update test stub
working-directory: nextcloud/apps/bbb working-directory: nextcloud/apps/bbb
run: composer update friendsofphp/php-cs-fixer nextcloud/ocp phpunit/phpunit -W run: composer update friendsofphp/php-cs-fixer nextcloud/ocp phpunit/phpunit vimeo/psalm -W
- name: Install dependencies - name: Install dependencies
working-directory: nextcloud/apps/bbb working-directory: nextcloud/apps/bbb
run: composer install run: composer install

View File

@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
ocp-version: [ "^30", "^29"] ocp-version: [ "^31", "^30", "^29"]
name: Nextcloud ${{ matrix.ocp-version }} name: Nextcloud ${{ matrix.ocp-version }}
steps: steps:
- name: Checkout - name: Checkout

View File

@ -44,7 +44,7 @@ Contributors are welcome! If you have time it would be awesome if you could help
<lib>curl</lib> <lib>curl</lib>
<lib>mbstring</lib> <lib>mbstring</lib>
<lib>SimpleXML</lib> <lib>SimpleXML</lib>
<nextcloud min-version="26" max-version="30"/> <nextcloud min-version="29" max-version="31"/>
</dependencies> </dependencies>
<commands> <commands>
<command>OCA\BigBlueButton\Command\ClearAvatarCache</command> <command>OCA\BigBlueButton\Command\ClearAvatarCache</command>

View File

@ -17,7 +17,7 @@
"nextcloud/coding-standard": "^1.1.0", "nextcloud/coding-standard": "^1.1.0",
"phpstan/phpstan": "^0.12.29", "phpstan/phpstan": "^0.12.29",
"nextcloud/ocp": "^29.0 || ^30.0 || ^31.0", "nextcloud/ocp": "^29.0 || ^30.0 || ^31.0",
"vimeo/psalm": "5.9.0", "vimeo/psalm": "5.9.0 || ^6.1.0",
"psr/container": "^1.1.2 || ^1.1.4 || ^2.0.2" "psr/container": "^1.1.2 || ^1.1.4 || ^2.0.2"
}, },
"config": { "config": {