From 9b9491b864bf1cea98ddcb7bf06df9c9c9c727ab Mon Sep 17 00:00:00 2001 From: sualko Date: Sun, 24 Jul 2022 13:20:48 +0200 Subject: [PATCH] feat: bump nc version --- .github/workflows/php-test.yml | 23 +++++++---------------- .github/workflows/static.yml | 2 +- appinfo/info.xml | 2 +- composer.json | 2 +- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/.github/workflows/php-test.yml b/.github/workflows/php-test.yml index 533c91b..d1b0be3 100644 --- a/.github/workflows/php-test.yml +++ b/.github/workflows/php-test.yml @@ -11,17 +11,13 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ['7.3', '7.4'] - nextcloud-versions: ['stable21', 'stable22'] + php-versions: ['7.4', '8'] + nextcloud-versions: ['stable22', 'stable23', 'stable24'] include: - - php-versions: '7.4' - nextcloud-versions: 'stable24' - - php-versions: '8' + - php-versions: '7.3' nextcloud-versions: 'stable22' - - php-versions: '8' - nextcloud-versions: 'stable24' - - php-versions: '8.1' - nextcloud-versions: 'stable24' + - php-versions: '7.3' + nextcloud-versions: 'stable23' name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests env: CI: true @@ -41,14 +37,9 @@ jobs: uses: actions/checkout@master with: path: nextcloud/apps/bbb - - name: Fix php-parser on stable20 incompatibility with phpunit 9.3+ - if: ${{ matrix.nextcloud-versions == 'stable20' }} - working-directory: nextcloud/3rdparty - run: composer require nikic/php-parser:4.10 - - name: Downgrade phpunit for php7.2 - if: ${{ matrix.php-versions == '7.2' }} + - name: Update test stub working-directory: nextcloud/apps/bbb - run: composer update phpunit/phpunit christophwurst/nextcloud -W + run: composer update christophwurst/nextcloud -W - name: Install dependencies working-directory: nextcloud/apps/bbb run: composer install diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 617af64..12ea2a3 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ocp-version: [ 'dev-stable24', 'dev-stable22', 'dev-stable21' ] + ocp-version: [ 'dev-stable24', 'dev-stable23', 'dev-stable22' ] name: Nextcloud ${{ matrix.ocp-version }} steps: - name: Checkout diff --git a/appinfo/info.xml b/appinfo/info.xml index 12a915d..97251cb 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -43,7 +43,7 @@ Developer wanted! If you have time it would be awesome if you could help to enha curl mbstring SimpleXML - + OCA\BigBlueButton\Command\ClearAvatarCache diff --git a/composer.json b/composer.json index cecac3b..fe084d6 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "friendsofphp/php-cs-fixer": "^2.16", "nextcloud/coding-standard": "^0.5.0", "phpstan/phpstan": "^0.12.29", - "christophwurst/nextcloud": "^20.0 || ^21.0 || ^22.0", + "christophwurst/nextcloud": "^22.0 || ^23.0 || ^24.0", "vimeo/psalm": "^4.5" }, "config": {