From 93ac85e54e44f87e12ca2b253c1adb2eb4b79112 Mon Sep 17 00:00:00 2001 From: znerol Date: Wed, 26 Apr 2023 19:03:52 +0200 Subject: [PATCH 1/3] feat: drop support for nc 23, add nc 26 --- .github/workflows/lint.yml | 2 +- .github/workflows/php-test.yml | 2 +- .github/workflows/static.yml | 4 ++-- appinfo/info.xml | 4 ++-- composer.json | 2 +- composer.lock | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2f0f35b..d6a1a42 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: [7.3, 7.4, 8.0] + php-versions: [7.4, 8.0, 8.1] name: php${{ matrix.php-versions }} lint steps: - name: Checkout diff --git a/.github/workflows/php-test.yml b/.github/workflows/php-test.yml index a1696e4..c4e0e18 100644 --- a/.github/workflows/php-test.yml +++ b/.github/workflows/php-test.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: php-versions: ['7.4', '8'] - nextcloud-versions: ['stable23', 'stable24', 'stable25'] + nextcloud-versions: ['stable24', 'stable25', 'stable26'] name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests env: CI: true diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 7be4899..6392b63 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-stable25', 'dev-stable24', 'dev-stable23' ] + ocp-version: [ 'dev-stable26', 'dev-stable25', 'dev-stable24' ] name: Nextcloud ${{ matrix.ocp-version }} steps: - name: Checkout @@ -14,7 +14,7 @@ jobs: - name: Set up php uses: shivammathur/setup-php@master with: - php-version: 7.4 + php-version: 8.1 coverage: none - name: Update php-cs-fixer run: composer update friendsofphp/php-cs-fixer -W diff --git a/appinfo/info.xml b/appinfo/info.xml index ec01294..3ce413c 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -22,7 +22,7 @@ Developer wanted! If you have time it would be awesome if you could help to enha *This app integrates BigBlueButton and is not endorsed or certified by BigBlueButton Inc. BigBlueButton and the BigBlueButton Logo are trademarks of BigBlueButton Inc.* ]]> - 2.4.0 + 2.5.0-alpha agpl Klaus Herberth BigBlueButton @@ -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 7ec05e8..ee27b56 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "friendsofphp/php-cs-fixer": "^3", "nextcloud/coding-standard": "^1.0.0", "phpstan/phpstan": "^0.12.29", - "nextcloud/ocp": "^23.0 || ^24.0 || ^25.0", + "nextcloud/ocp": "^24.0 || ^25.0 || ^26.0", "vimeo/psalm": "^4.5" }, "config": { diff --git a/composer.lock b/composer.lock index c9aa7b9..72c3e80 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "434f3b95fbfba97b03d130cd3fb92140", + "content-hash": "37acdf729199a625b633edc0c4032096", "packages": [ { "name": "littleredbutton/bigbluebutton-api-php", @@ -4834,5 +4834,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } From ee25c1b8212b5077a0d25d5169f9bf5de73815b4 Mon Sep 17 00:00:00 2001 From: znerol Date: Wed, 26 Apr 2023 19:28:15 +0200 Subject: [PATCH 2/3] fix: exclude test PHP 7.4 / nc 26 --- .github/workflows/php-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/php-test.yml b/.github/workflows/php-test.yml index c4e0e18..ccc941c 100644 --- a/.github/workflows/php-test.yml +++ b/.github/workflows/php-test.yml @@ -13,6 +13,9 @@ jobs: matrix: php-versions: ['7.4', '8'] nextcloud-versions: ['stable24', 'stable25', 'stable26'] + exclude: + - php-versions: '7.4' + nextcloud-versions: 'stable26' name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests env: CI: true From 8519a652843ec5ea0d9230c603829a56498731cf Mon Sep 17 00:00:00 2001 From: znerol Date: Fri, 7 Jul 2023 09:28:15 +0200 Subject: [PATCH 3/3] feat: drop support for nc 24, add nc 27 --- .github/workflows/php-test.yml | 4 +++- .github/workflows/static.yml | 2 +- appinfo/info.xml | 2 +- composer.json | 2 +- composer.lock | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/php-test.yml b/.github/workflows/php-test.yml index ccc941c..206c4e6 100644 --- a/.github/workflows/php-test.yml +++ b/.github/workflows/php-test.yml @@ -12,10 +12,12 @@ jobs: strategy: matrix: php-versions: ['7.4', '8'] - nextcloud-versions: ['stable24', 'stable25', 'stable26'] + nextcloud-versions: ['stable25', 'stable26', 'stable27'] exclude: - php-versions: '7.4' nextcloud-versions: 'stable26' + - php-versions: '7.4' + nextcloud-versions: 'stable27' name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests env: CI: true diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 6392b63..4d84b74 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-stable26', 'dev-stable25', 'dev-stable24' ] + ocp-version: [ 'dev-stable27', 'dev-stable26', 'dev-stable25' ] name: Nextcloud ${{ matrix.ocp-version }} steps: - name: Checkout diff --git a/appinfo/info.xml b/appinfo/info.xml index 3ce413c..557f2d4 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 ee27b56..de225f0 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "friendsofphp/php-cs-fixer": "^3", "nextcloud/coding-standard": "^1.0.0", "phpstan/phpstan": "^0.12.29", - "nextcloud/ocp": "^24.0 || ^25.0 || ^26.0", + "nextcloud/ocp": "^25.0 || ^26.0 || ^27.0", "vimeo/psalm": "^4.5" }, "config": { diff --git a/composer.lock b/composer.lock index 72c3e80..bbc3ee0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "37acdf729199a625b633edc0c4032096", + "content-hash": "feb9af8a85a0a6dd2511e8dfb2546e38", "packages": [ { "name": "littleredbutton/bigbluebutton-api-php",