From e864f583b903b9b757e611b9df6b97b6fb89b201 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 26 Aug 2026 07:57:16 +0200 Subject: [PATCH 1/2] feat(deps): Add Nextcloud 36 support on master Signed-off-by: Joas Schilling Signed-off-by: Daniel Kesselberg --- .github/workflows/npm-audit-fix.yml | 1 + .github/workflows/update-nextcloud-ocp.yml | 1 + appinfo/info.xml | 4 ++-- composer.lock | 20 ++++++++++---------- js/serverinfo-main.mjs.license | 2 +- js/serverinfo-main.mjs.map.license | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml index 928fc930..fd84e64a 100644 --- a/.github/workflows/npm-audit-fix.yml +++ b/.github/workflows/npm-audit-fix.yml @@ -26,6 +26,7 @@ jobs: matrix: branches: - ${{ github.event.repository.default_branch }} + - 'stable35' - 'stable34' - 'stable33' - 'stable32' diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index f09ae8f9..2d359af4 100644 --- a/.github/workflows/update-nextcloud-ocp.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -29,6 +29,7 @@ jobs: matrix: branches: - ${{ github.event.repository.default_branch }} + - 'stable35' - 'stable34' - 'stable33' - 'stable32' diff --git a/appinfo/info.xml b/appinfo/info.xml index 3dd3e4ad..0dcf2baa 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -9,7 +9,7 @@ Monitoring Monitoring app with useful server information Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc. - 7.0.0-dev.0 + 8.0.0-dev.0 agpl Bjoern Schiessle Ivan Sein Santiago @@ -19,7 +19,7 @@ monitoring https://github.com/nextcloud/serverinfo/issues - + OCA\ServerInfo\Jobs\UpdateStorageStats diff --git a/composer.lock b/composer.lock index ccd76b7c..fcd6160d 100644 --- a/composer.lock +++ b/composer.lock @@ -104,12 +104,12 @@ "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "d120ec35c52c609770774e937bf4e6c7fc7dcc89" + "reference": "ddc90a88f4ec0166a1c0384cf6d0370e3dc53898" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/d120ec35c52c609770774e937bf4e6c7fc7dcc89", - "reference": "d120ec35c52c609770774e937bf4e6c7fc7dcc89", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/ddc90a88f4ec0166a1c0384cf6d0370e3dc53898", + "reference": "ddc90a88f4ec0166a1c0384cf6d0370e3dc53898", "shasum": "" }, "require": { @@ -150,7 +150,7 @@ "issues": "https://github.com/nextcloud-deps/ocp/issues", "source": "https://github.com/nextcloud-deps/ocp/tree/master" }, - "time": "2026-08-22T00:35:13+00:00" + "time": "2026-08-26T00:37:28+00:00" }, { "name": "psr/clock", @@ -460,16 +460,16 @@ }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.38.0", + "version": "v1.42.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b" + "reference": "aa20edea75bd9c48cfecc8360922e5a6e5c44502" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/2d446c214bdbe5b71bde5011b060a05fece3ae6b", - "reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/aa20edea75bd9c48cfecc8360922e5a6e5c44502", + "reference": "aa20edea75bd9c48cfecc8360922e5a6e5c44502", "shasum": "" }, "require": { @@ -521,7 +521,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.38.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.42.0" }, "funding": [ { @@ -541,7 +541,7 @@ "type": "tidelift" } ], - "time": "2026-05-25T13:48:31+00:00" + "time": "2026-08-07T06:33:24+00:00" }, { "name": "symfony/polyfill-php84", diff --git a/js/serverinfo-main.mjs.license b/js/serverinfo-main.mjs.license index 43c4f714..723559a4 100644 --- a/js/serverinfo-main.mjs.license +++ b/js/serverinfo-main.mjs.license @@ -101,7 +101,7 @@ This file is generated from multiple sources. Included packages: - version: 7.8.1 - license: ISC - serverinfo - - version: 6.0.0 + - version: 8.0.0-dev.0 - license: AGPL-3.0-or-later - tabbable - version: 6.5.0 diff --git a/js/serverinfo-main.mjs.map.license b/js/serverinfo-main.mjs.map.license index 43c4f714..723559a4 100644 --- a/js/serverinfo-main.mjs.map.license +++ b/js/serverinfo-main.mjs.map.license @@ -101,7 +101,7 @@ This file is generated from multiple sources. Included packages: - version: 7.8.1 - license: ISC - serverinfo - - version: 6.0.0 + - version: 8.0.0-dev.0 - license: AGPL-3.0-or-later - tabbable - version: 6.5.0 diff --git a/package-lock.json b/package-lock.json index ffa7725f..e61fc357 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "serverinfo", - "version": "6.0.0", + "version": "8.0.0-dev.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "serverinfo", - "version": "6.0.0", + "version": "8.0.0-dev.0", "license": "AGPL-3.0-or-later", "dependencies": { "@nextcloud/axios": "^2.6.0", diff --git a/package.json b/package.json index 62745f1a..c356a84d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "serverinfo", - "version": "6.0.0", + "version": "8.0.0-dev.0", "private": true, "description": "Monitoring app with useful server information", "license": "AGPL-3.0-or-later", From 0073e886f9e9ce974ee8f15da5d42384c44e0f4b Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 26 Aug 2026 11:32:36 +0200 Subject: [PATCH 2/2] docs: Update license information to SPDX variant Signed-off-by: Andy Scherzinger Signed-off-by: Daniel Kesselberg --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 0dcf2baa..48e4d34b 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -10,7 +10,7 @@ Monitoring app with useful server information Provides useful server information, such as CPU load, RAM usage, disk usage, number of users, etc. 8.0.0-dev.0 - agpl + AGPL-3.0-or-later Bjoern Schiessle Ivan Sein Santiago Frank Karlitschek