From 665467abf2dc786c4463ec2b004e0eca01bcf186 Mon Sep 17 00:00:00 2001 From: Christian Hartmann Date: Tue, 15 Sep 2026 22:38:15 +0200 Subject: [PATCH 1/2] move main to stable5.5 Signed-off-by: Christian Hartmann --- .github/dependabot.yml | 4 ++-- .github/workflows/playwright.yml | 2 +- .github/workflows/playwright.yml.patch | 2 +- .github/workflows/sync-workflow-templates.yml | 2 +- .github/workflows/sync-workflow-templates.yml.patch | 2 +- .tx/backport | 2 +- appinfo/info.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f430f4129..61ccb4379 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -51,7 +51,7 @@ updates: - dependencies - package-ecosystem: composer - target-branch: 'stable5.3' + target-branch: 'stable5.4' directories: - '/' - '/vendor-bin/*/' @@ -68,7 +68,7 @@ updates: - dependencies - package-ecosystem: npm - target-branch: 'stable5.3' + target-branch: 'stable5.4' directory: '/' schedule: interval: weekly diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index 95ebdc966..03273863f 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -30,7 +30,7 @@ on: pull_request: branches: - main - - stable5.3 + - stable5.4 permissions: contents: read diff --git a/.github/workflows/playwright.yml.patch b/.github/workflows/playwright.yml.patch index 2563e4c01..d14e79fd1 100644 --- a/.github/workflows/playwright.yml.patch +++ b/.github/workflows/playwright.yml.patch @@ -11,7 +11,7 @@ index c218bffb..1e0028ab 100644 - - stable34 - - stable33 + - main -+ - stable5.3 ++ - stable5.4 permissions: contents: read diff --git a/.github/workflows/sync-workflow-templates.yml b/.github/workflows/sync-workflow-templates.yml index e7094c713..b43db987d 100644 --- a/.github/workflows/sync-workflow-templates.yml +++ b/.github/workflows/sync-workflow-templates.yml @@ -26,7 +26,7 @@ jobs: matrix: branches: - ${{ github.event.repository.default_branch }} - - 'stable5.3' + - 'stable5.4' name: Update workflows in ${{ matrix.branches }} diff --git a/.github/workflows/sync-workflow-templates.yml.patch b/.github/workflows/sync-workflow-templates.yml.patch index acd8db0c6..b2df274a1 100644 --- a/.github/workflows/sync-workflow-templates.yml.patch +++ b/.github/workflows/sync-workflow-templates.yml.patch @@ -9,7 +9,7 @@ index 85090be9..cf08bd3e 100644 - - 'stable34' - - 'stable33' - - 'stable32' -+ - 'stable5.3' ++ - 'stable5.4' name: Update workflows in ${{ matrix.branches }} diff --git a/.tx/backport b/.tx/backport index ffa7ce8bb..6a384e0d4 100644 --- a/.tx/backport +++ b/.tx/backport @@ -1 +1 @@ -stable5.3 +stable5.4 diff --git a/appinfo/info.xml b/appinfo/info.xml index 350e08b51..c979b1b43 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -17,7 +17,7 @@ - **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)! ]]> - 5.4.0 + 5.5.0-dev AGPL-3.0-or-later Affan Hussain From 50236e3fcd1ec0773ff5f8eed0d3eb34a73e7575 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Sep 2026 20:39:56 +0000 Subject: [PATCH 2/2] Chore(deps-dev): Bump @types/node from 26.5.0 to 26.5.1 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 26.5.0 to 26.5.1. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-version: 26.5.1 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 324f272b9..e73204ea6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,7 +38,7 @@ "@nextcloud/stylelint-config": "^3.2.2", "@nextcloud/vite-config": "^2.5.2", "@playwright/test": "^1.63.0", - "@types/node": "^26.5.0", + "@types/node": "^26.5.1", "@types/qrcode": "^1.5.6", "@vue/tsconfig": "^0.9.1", "eslint-config-prettier": "^10.1.8", @@ -3053,9 +3053,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "26.5.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-26.5.0.tgz", - "integrity": "sha512-dVSGpriSoCgz8WnDNTuSSuSv1PC/ALXihO4ulRZt7Md8k9mlbdin3lGOcDE8SnWOgf513ByWlXd7BK4azmyg/A==", + "version": "26.5.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-26.5.1.tgz", + "integrity": "sha512-CzNm2FezW4VR/LjG6yUdiEgLE/rAQ9Slj5gCu/C2VrdcW7I0ahNZ8DRbHT7zOZ6r3ONgd/bsQIeSaoDGrd1C6g==", "devOptional": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 9a53a7aa8..b9d196b5c 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "@nextcloud/stylelint-config": "^3.2.2", "@nextcloud/vite-config": "^2.5.2", "@playwright/test": "^1.63.0", - "@types/node": "^26.5.0", + "@types/node": "^26.5.1", "@types/qrcode": "^1.5.6", "@vue/tsconfig": "^0.9.1", "eslint-config-prettier": "^10.1.8",