From 55e1f752a48c5564f363bf58bbf0de2ac326812e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 28 Mar 2024 13:18:30 +0100 Subject: [PATCH 1/5] feat(deps): Add Nextcloud 30 support Signed-off-by: Joas Schilling --- CHANGELOG.md | 7 +++++++ appinfo/info.xml | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1111914..7e3a2bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Changelog All notable changes to this project will be documented in this file. +## 1.2.0 - 2024-07-25 +### Added +- Nextcloud 30 compatibility + +### Removed +- Nextcloud 27 compatibility + ## 1.1.1 - 2024-06-07 ### Fixed - Fix an issue with local domains and self-signed certificates diff --git a/appinfo/info.xml b/appinfo/info.xml index d6c7c8b..a0179fa 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -8,7 +8,7 @@ - You can also post multiple tasks in a single message, just put each on its own line starting with a keyword - At the end of the call, the bot will summarize it and list all the attendees as well as the tasks in a markdown chat message]]> - 1.1.1 + 1.2.0 agpl Joas Schilling @@ -26,7 +26,7 @@ https://raw.githubusercontent.com/nextcloud/call_summary_bot/main/docs/screenshot.png - + From 7be4181bbe5ddf09f5f397100c768a03a8897cbe Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 25 Jul 2024 06:16:13 +0200 Subject: [PATCH 2/5] fix(CI): Bump nextcloud/ocp to 28 accordingly Signed-off-by: Joas Schilling --- .../workflows/update-nextcloud-ocp-matrix.yml | 2 +- composer.json | 4 ++-- composer.lock | 20 +++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/update-nextcloud-ocp-matrix.yml b/.github/workflows/update-nextcloud-ocp-matrix.yml index ec65db9..497828f 100644 --- a/.github/workflows/update-nextcloud-ocp-matrix.yml +++ b/.github/workflows/update-nextcloud-ocp-matrix.yml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: branches: ['main'] - target: ['stable27'] + target: ['stable28'] name: update-nextcloud-ocp-${{ matrix.branches }} diff --git a/composer.json b/composer.json index 02662ee..0a68749 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "license": "AGPL", "require-dev": { "nextcloud/coding-standard": "^1.1", - "nextcloud/ocp": "dev-stable27", + "nextcloud/ocp": "dev-stable28", "phpunit/phpunit": "^9.6", "psalm/phar": "^5.13" }, @@ -17,7 +17,7 @@ "optimize-autoloader": true, "classmap-authoritative": true, "platform": { - "php": "8.0" + "php": "8.0.2" }, "sort-packages": true }, diff --git a/composer.lock b/composer.lock index 909b83b..8a6d392 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": "d1574236773edca65a2412387cb1bf9e", + "content-hash": "9cb49066bd7f8d49621e576dad14b138", "packages": [], "packages-dev": [ { @@ -179,20 +179,20 @@ }, { "name": "nextcloud/ocp", - "version": "dev-stable27", + "version": "dev-stable28", "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "a25af68d428145141ac85ae0746f70d9f04911e4" + "reference": "74645201388ba3e2891b364e526de90cf710949e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/a25af68d428145141ac85ae0746f70d9f04911e4", - "reference": "a25af68d428145141ac85ae0746f70d9f04911e4", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/74645201388ba3e2891b364e526de90cf710949e", + "reference": "74645201388ba3e2891b364e526de90cf710949e", "shasum": "" }, "require": { - "php": "^7.4 || ~8.0 || ~8.1", + "php": "~8.0 || ~8.1 || ~8.2 || ~8.3", "psr/clock": "^1.0", "psr/container": "^2.0.2", "psr/event-dispatcher": "^1.0", @@ -201,7 +201,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-stable27": "27.0.0-dev" + "dev-stable28": "28.0.0-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -217,9 +217,9 @@ "description": "Composer package containing Nextcloud's public API (classes, interfaces)", "support": { "issues": "https://github.com/nextcloud-deps/ocp/issues", - "source": "https://github.com/nextcloud-deps/ocp/tree/stable27" + "source": "https://github.com/nextcloud-deps/ocp/tree/stable28" }, - "time": "2024-06-05T00:35:15+00:00" + "time": "2024-07-11T00:37:33+00:00" }, { "name": "nikic/php-parser", @@ -2131,7 +2131,7 @@ "platform": [], "platform-dev": [], "platform-overrides": { - "php": "8.0" + "php": "8.0.2" }, "plugin-api-version": "2.6.0" } From c9c09e71e93c00ba2aa26beaf665bd642cdde548 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 25 Jul 2024 06:16:32 +0200 Subject: [PATCH 3/5] ci: Remove unused action Signed-off-by: Joas Schilling --- .../phpunit-summary-when-unrelated.yml | 68 ------------------- 1 file changed, 68 deletions(-) delete mode 100644 .github/workflows/phpunit-summary-when-unrelated.yml diff --git a/.github/workflows/phpunit-summary-when-unrelated.yml b/.github/workflows/phpunit-summary-when-unrelated.yml deleted file mode 100644 index 484fdbb..0000000 --- a/.github/workflows/phpunit-summary-when-unrelated.yml +++ /dev/null @@ -1,68 +0,0 @@ -# This workflow is provided via the organization template repository -# -# https://github.com/nextcloud/.github -# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization - -name: PHPUnit summary - -on: - pull_request: - paths-ignore: - - '.github/workflows/**' - - 'appinfo/**' - - 'lib/**' - - 'templates/**' - - 'tests/**' - - 'vendor/**' - - 'vendor-bin/**' - - '.php-cs-fixer.dist.php' - - 'composer.json' - - 'composer.lock' - -permissions: - contents: read - -jobs: - summary-mysql: - permissions: - contents: none - runs-on: ubuntu-latest - - name: phpunit-mysql-summary - - steps: - - name: Summary status - run: 'echo "No PHP files changed, skipped PHPUnit"' - - summary-oci: - permissions: - contents: none - runs-on: ubuntu-latest - - name: phpunit-oci-summary - - steps: - - name: Summary status - run: 'echo "No PHP files changed, skipped PHPUnit"' - - summary-pgsql: - permissions: - contents: none - runs-on: ubuntu-latest - - name: phpunit-pgsql-summary - - steps: - - name: Summary status - run: 'echo "No PHP files changed, skipped PHPUnit"' - - summary-sqlite: - permissions: - contents: none - runs-on: ubuntu-latest - - name: phpunit-sqlite-summary - - steps: - - name: Summary status - run: 'echo "No PHP files changed, skipped PHPUnit"' From 3c63f0e77875aeb95e4b2fbac253c34e21a3b125 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 25 Jul 2024 06:17:42 +0200 Subject: [PATCH 4/5] ci: Update all workflows Signed-off-by: Joas Schilling --- .github/workflows/appstore-build-publish.yml | 6 +++--- .github/workflows/dependabot-approve-merge.yml | 6 ++++++ .github/workflows/lint-php-cs.yml | 2 +- .github/workflows/lint-php.yml | 2 +- .github/workflows/phpunit-mariadb.yml | 2 +- .github/workflows/phpunit-mysql.yml | 2 +- .github/workflows/phpunit-oci.yml | 2 +- .github/workflows/phpunit-pgsql.yml | 2 +- .github/workflows/phpunit-sqlite.yml | 2 +- .github/workflows/pr-feedback.yml | 2 +- .github/workflows/psalm-matrix.yml | 2 +- .github/workflows/update-nextcloud-ocp-approve-merge.yml | 6 ++++++ .github/workflows/update-nextcloud-ocp-matrix.yml | 2 +- 13 files changed, 25 insertions(+), 13 deletions(-) diff --git a/.github/workflows/appstore-build-publish.yml b/.github/workflows/appstore-build-publish.yml index 7be03c0..aa8d7dc 100644 --- a/.github/workflows/appstore-build-publish.yml +++ b/.github/workflows/appstore-build-publish.yml @@ -56,7 +56,7 @@ jobs: - name: Set up node ${{ steps.versions.outputs.nodeVersion }} # Skip if no package.json if: ${{ steps.versions.outputs.nodeVersion }} - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3 + uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 with: node-version: ${{ steps.versions.outputs.nodeVersion }} @@ -72,7 +72,7 @@ jobs: filename: ${{ env.APP_NAME }}/appinfo/info.xml - name: Set up php ${{ steps.php-versions.outputs.php-min }} - uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1 with: php-version: ${{ steps.php-versions.outputs.php-min }} coverage: none @@ -95,7 +95,7 @@ jobs: # Skip if no package.json if: ${{ steps.versions.outputs.nodeVersion }} env: - NODE_ENV: production + CYPRESS_INSTALL_BINARY: 0 run: | cd ${{ env.APP_NAME }} npm ci diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml index 0d6b2c2..efe8bfe 100644 --- a/.github/workflows/dependabot-approve-merge.yml +++ b/.github/workflows/dependabot-approve-merge.yml @@ -31,6 +31,12 @@ jobs: pull-requests: write steps: + - name: Disabled on forks + if: ${{ github.event.pull_request.head.repo.full_name != github.repository }} + run: | + echo 'Can not approve PRs from forks' + exit 1 + # GitHub actions bot approve - uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2 with: diff --git a/.github/workflows/lint-php-cs.yml b/.github/workflows/lint-php-cs.yml index b6f1232..5108348 100644 --- a/.github/workflows/lint-php-cs.yml +++ b/.github/workflows/lint-php-cs.yml @@ -32,7 +32,7 @@ jobs: uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1 - name: Set up php${{ steps.versions.outputs.php-available }} - uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1 with: php-version: ${{ steps.versions.outputs.php-available }} extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml index fc43037..104fed6 100644 --- a/.github/workflows/lint-php.yml +++ b/.github/workflows/lint-php.yml @@ -43,7 +43,7 @@ jobs: uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1 with: php-version: ${{ matrix.php-versions }} extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml index f621539..d3cc10d 100644 --- a/.github/workflows/phpunit-mariadb.yml +++ b/.github/workflows/phpunit-mariadb.yml @@ -100,7 +100,7 @@ jobs: path: apps/${{ env.APP_NAME }} - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1 with: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml index dc2981b..c0f4c69 100644 --- a/.github/workflows/phpunit-mysql.yml +++ b/.github/workflows/phpunit-mysql.yml @@ -98,7 +98,7 @@ jobs: path: apps/${{ env.APP_NAME }} - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1 with: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml index 9c23721..d03beb9 100644 --- a/.github/workflows/phpunit-oci.yml +++ b/.github/workflows/phpunit-oci.yml @@ -111,7 +111,7 @@ jobs: path: apps/${{ env.APP_NAME }} - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1 with: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml index f784790..2a23e02 100644 --- a/.github/workflows/phpunit-pgsql.yml +++ b/.github/workflows/phpunit-pgsql.yml @@ -101,7 +101,7 @@ jobs: path: apps/${{ env.APP_NAME }} - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1 with: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml index 28b9b8c..be9e332 100644 --- a/.github/workflows/phpunit-sqlite.yml +++ b/.github/workflows/phpunit-sqlite.yml @@ -90,7 +90,7 @@ jobs: path: apps/${{ env.APP_NAME }} - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1 with: php-version: ${{ matrix.php-versions }} # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation diff --git a/.github/workflows/pr-feedback.yml b/.github/workflows/pr-feedback.yml index 7b68226..6a01fa0 100644 --- a/.github/workflows/pr-feedback.yml +++ b/.github/workflows/pr-feedback.yml @@ -46,5 +46,5 @@ jobs: (If you believe you should not receive this message, you can add yourself to the [blocklist](https://github.com/nextcloud/.github/blob/master/non-community-usernames.txt).) days-before-feedback: 14 start-date: '2024-04-30' - exempt-authors: '${{ steps.blocklist.outputs.blocklist }},${{ steps.scrape.outputs.users }},nextcloud-command,nextcloud-android-bot' + exempt-authors: '${{ steps.blocklist.outputs.blocklist }},${{ steps.scrape.outputs.users }}' exempt-bots: true diff --git a/.github/workflows/psalm-matrix.yml b/.github/workflows/psalm-matrix.yml index 64da948..b9d9249 100644 --- a/.github/workflows/psalm-matrix.yml +++ b/.github/workflows/psalm-matrix.yml @@ -40,7 +40,7 @@ jobs: uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Set up php${{ matrix.php-versions }} - uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1 with: php-version: ${{ matrix.php-versions }} extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite diff --git a/.github/workflows/update-nextcloud-ocp-approve-merge.yml b/.github/workflows/update-nextcloud-ocp-approve-merge.yml index b16485e..5edf7ac 100644 --- a/.github/workflows/update-nextcloud-ocp-approve-merge.yml +++ b/.github/workflows/update-nextcloud-ocp-approve-merge.yml @@ -33,6 +33,12 @@ jobs: contents: write steps: + - name: Disabled on forks + if: ${{ github.event.pull_request.head.repo.full_name != github.repository }} + run: | + echo 'Can not approve PRs from forks' + exit 1 + - uses: mdecoleman/pr-branch-name@bab4c71506bcd299fb350af63bb8e53f2940a599 # v2.0.0 id: branchname with: diff --git a/.github/workflows/update-nextcloud-ocp-matrix.yml b/.github/workflows/update-nextcloud-ocp-matrix.yml index 497828f..8fdd3d5 100644 --- a/.github/workflows/update-nextcloud-ocp-matrix.yml +++ b/.github/workflows/update-nextcloud-ocp-matrix.yml @@ -32,7 +32,7 @@ jobs: submodules: true - name: Set up php8.2 - uses: shivammathur/setup-php@2e947f1f6932d141d076ca441d0e1e881775e95b # v2.31.0 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1 with: php-version: 8.2 # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation From 629617590183c3fb2510fc52f63202f362b0813f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 25 Jul 2024 06:22:23 +0200 Subject: [PATCH 5/5] fix(CI): Update psalm handling Signed-off-by: Joas Schilling --- .../Version1000Date20230719061613.php | 3 --- psalm.xml | 3 ++- tests/psalm-baseline.xml | 23 +------------------ 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/lib/Migration/Version1000Date20230719061613.php b/lib/Migration/Version1000Date20230719061613.php index 78a1733..c9eaccd 100644 --- a/lib/Migration/Version1000Date20230719061613.php +++ b/lib/Migration/Version1000Date20230719061613.php @@ -32,9 +32,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; -/** - * Auto-generated migration step: Please modify to your needs! - */ class Version1000Date20230719061613 extends SimpleMigrationStep { /** diff --git a/psalm.xml b/psalm.xml index 22f7400..7d78ec5 100644 --- a/psalm.xml +++ b/psalm.xml @@ -8,6 +8,7 @@ xmlns="https://getpsalm.org/schema/config" xsi:schemaLocation="https://getpsalm.org/schema/config" errorBaseline="tests/psalm-baseline.xml" + phpVersion="8.0.2" > @@ -21,7 +22,7 @@ - + diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml index d48d918..7bf39a8 100644 --- a/tests/psalm-baseline.xml +++ b/tests/psalm-baseline.xml @@ -1,23 +1,2 @@ - - - - Base - - - - - Base - - - - - Base - - - - - Base - - - +