Skip to content

IONOS: upgrade fork app submodules to max NC33-compatible upstream (NSW-1069) - #381

Draft
printminion-co wants to merge 5 commits into
ionos-dev-v33from
mk/dev/NSW-1069-update-fork-apps-nc33
Draft

printminion-co wants to merge 5 commits into
ionos-dev-v33from
mk/dev/NSW-1069-update-fork-apps-nc33

Conversation

@printminion-co

@printminion-co printminion-co commented Oct 1, 2026 •

Copy link
Copy Markdown

Summary

Rebase every IONOS fork app onto the newest stable upstream release that covers NC33 and move the gitlinks. Targets come from .dev/tools/fork-apps-scan.sh (IONOS-Productivity/nc-docs-and-tools#220): newest stable upstream tag whose info.xml covers NC33; "at max" decided by ancestry; IONOS delta = fork-only commits, cherry-picked with -x and reconciled.

Scan at the base (ionos-dev-v33, 33.0.9):

App Upstream Pinned Base Target NC range IONOS commits Status
viewer nextcloud/viewer 1aea74cce (untagged) v33.0.9 v33.0.9 33–33 1 at max
activity nextcloud/activity v33.0.8-c851894 v33.0.8 v33.0.9 33–33 1 rebase
mail nextcloud/mail 1627f0972 (untagged) v5.5.11 v5.12.3 32–35 148 rebase
forms nextcloud/forms v5.3.6 (upstream) v5.3.6 v5.4.0 33–35 0 mirror bump
assistant nextcloud/assistant v2.12.0-6152a89 v2.12.0 v3.5.0 33–34 1 rebase, major
password_policy nextcloud/password_policy v33.0.8-3c9bd14 v33.0.8 v33.0.9 33–33 1 rebase
notifications nextcloud/notifications v33.0.9 (upstream) v33.0.9 v33.0.9 33–33 0 at max
user_oidc nextcloud/user_oidc 085f98727 (untagged) v8.1.0 v8.11.0 29–35 1 rebase
bruteforcesettings nextcloud/bruteforcesettings v33.0.8-cecf3a1 v33.0.8 v33.0.9 33–33 1 rebase
user_saml nextcloud/user_saml v7.1.3-6e99e21 v7.1.3 v8.4.0 32–36 2 rebase, major
eurooffice Euro-Office/eurooffice-nextcloud 11.0.5-3419261 v11.0.5 v11.0.5 33–35 7 at max
App Change Fork PR Pinned here Final pin
activity v33.0.8 → v33.0.9, delta kept IONOS-Productivity/nc-activity#6 PR head 8978ef2 v33.0.9-<sha7> after merge
password_policy v33.0.8 → v33.0.9, delta kept (+ #[\Override] psalm fix) IONOS-Productivity/nc-password_policy#5 PR head b7e80e0 v33.0.9-<sha7> after merge
bruteforcesettings v33.0.8 → v33.0.9, delta kept IONOS-Productivity/nc-bruteforcesettings#6 PR head 22464ae v33.0.9-<sha7> after merge
user_oidc v8.1.0 → v8.11.0, delta kept IONOS-Productivity/nc-user_oidc#6 PR head a084fcb v8.11.0-<sha7> after merge
forms v5.3.6 → v5.4.0, vanilla mirror — v5.4.0 v5.4.0

Major bumps are split out into their own PRs so they can be tested and reverted on their own:

Out of scope: vanilla apps (#370, NSW-1051), IONOS custom apps, 3rdparty. mail (ncw-mail, 148 IONOS commits, v5.5.11 → v5.12.3) is split out to NSW-1070.

Notes

  • Draft until the fork PRs merge. The four fork gitlinks point at the PR heads ("pre-tag" commits) so the artifact could be evaluated; after merge each fork gets a prerelease tag v<upstream>-<sha7> and these commits are re-pointed to the tags.
  • Fork CI. Fork jobs on ubuntu-latest-low never start in this org (left as is); the delta was validated on the checks that run plus local psalm / eslint / build / reuse. All fork-PR failures were traced to the base (runner label, Playwright against server master, upstream *-master breakage) except one psalm error in password_policy, fixed in the delta.
  • Artifact build with all seven forks (before the split): green (run 36858750282).

Checklist

Jira: NSW-1069

… fork, pre-tag)

Pre-release pin for build artifact evaluation: upstream v33.0.9 + IONOS delta. Replaced by the prerelease tag once the fork PR is merged.

PR: IONOS-Productivity/nc-activity#6
SHA: 8978ef28d3d673180253533bdc286da29650ef69
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
…3 IONOS fork, pre-tag)

Pre-release pin for build artifact evaluation: upstream v33.0.9 + IONOS delta. Replaced by the prerelease tag once the fork PR is merged.

PR: IONOS-Productivity/nc-password_policy#5
SHA: b7e80e0655db8469f2c45d3410b1ce5706c16c72
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
…NC33 IONOS fork, pre-tag)

Pre-release pin for build artifact evaluation: upstream v33.0.9 + IONOS delta. Replaced by the prerelease tag once the fork PR is merged.

PR: IONOS-Productivity/nc-bruteforcesettings#6
SHA: 22464ae59a904d4bcfb8295a6c65ada23c11719d
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
…S fork, pre-tag)

Pre-release pin for build artifact evaluation: upstream v8.11.0 + IONOS delta. Replaced by the prerelease tag once the fork PR is merged.

PR: IONOS-Productivity/nc-user_oidc#6
SHA: a084fcbe123f04bb34c8d215d2793439153e73e1
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
…rror)

Tag: https://github.com/IONOS-Productivity/nc-forms/tree/v5.4.0
SHA: 8f2b8d4b03cc3f50b4603864f4eb7e91ea13a11e
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant