Skip to content

IONOS(activity): NC32 fork release (NSW-946) - #2

Merged
printminion-co merged 1 commit into
ionos-dev-v32from
mk/dev/NSW-946-activity-nc32
Aug 28, 2026
Merged

IONOS(activity): NC32 fork release (NSW-946)#2
printminion-co merged 1 commit into
ionos-dev-v32from
mk/dev/NSW-946-activity-nc32

Conversation

@printminion-co

Copy link
Copy Markdown

Summary

NC32 IONOS activity line: upstream v32.0.14 + rebased IONOS patches.

  • Integration branch ionos-dev-v32 = vanilla v32.0.14.
  • This PR adds the IONOS commits on top.

Reconciliation against v32.0.14

IONOS commit Outcome
ca3cd2e IONOS(admin-settings): convert to delegated setting kept — upstream still declares implements ISettings at v32.0.14, so the delegation patch is not redundant

The cherry-pick applied cleanly. #[\Override] was added to the two new IDelegatedSettings methods to match the attributes NC32 introduced on the other methods in this class.

Commit hashes are unformatted so GitHub auto-links them.

Consumed by IONOS-Productivity/ncw-server via a submodule bump after merge + tag.

Jira: NSW-946

Signed-off-by: Kai Henseler <[email protected]>
(cherry picked from commit ca3cd2e)
Signed-off-by: Misha M.-Kupriyanov <[email protected]>
@printminion-co

Copy link
Copy Markdown
Author

The two Cypress failures (runner 1, runner 2) are base failures, not introduced by this PR.

Verified with a control PR — #3 — containing bare upstream v32.0.14 and zero file changes.
It fails the same two jobs with the same counts:

runner 1 runner 2
#2 (with IONOS delta) fail fail
#3 (bare v32.0.14) fail fail

The delta here touches only lib/Settings/Admin.php; the failing spec (cypress/e2e/settings.cy.ts)
exercises the user notification page at /settings/user/notifications, rendered by
lib/Settings/Personal.php — a class this PR does not touch.

Per the fork-upgrade guide, a red check whose cause is unchanged from the vanilla base is not fixed
in the delta. Control PR now closed.

@printminion-co

Copy link
Copy Markdown
Author

Why most checks are stuck queued

These are not failures and they will not clear on their own.

These forks inherit the upstream Nextcloud workflows, most of which pin runs-on: ubuntu-latest-low
— a runner label that exists in the nextcloud org but not in IONOS-Productivity
(repos/.../actions/runners reports 0). Those jobs queue indefinitely; only the ubuntu-latest
ones ever execute.

Fork ubuntu-latest-low ubuntu-latest
nc-activity 30 22
nc-bruteforcesettings 32 17
nc-password_policy 26 16

This is pre-existing, not caused by these PRs: nc-bruteforcesettings has never had a successful
PHPUnit run in its history — the single attempt, on kh/dev/delegate-admin-settings in Feb 2026
(the branch that produced the very commit cherry-picked here), was cancelled. Worth its own ticket;
out of scope here.

Judge these PRs on the checks that can run. Psalm is among them, and it is the check that would
catch a broken IDelegatedSettings implementation.

On this PR the runnable checks are: static-psalm-analysis ✅, php-cs ✅, stylelint ✅,
init ✅. The only red is Cypress runner 1/runner 2, already established above as a base
failure via control PR #3.

printminion-co added a commit to IONOS-Productivity/ncw-server that referenced this pull request Aug 27, 2026
Rebases the IONOS delegated-settings delta onto vanilla v32.0.14. The app
previously declared min-version="31" max-version="31" and would not enable
on NC32.

Upstream v32.0.14 still declares `implements ISettings`, so the IONOS
commit was reapplied rather than dropped.

PR: IONOS-Productivity/nc-activity#2
SHA: caf536235a85d98c108c624638fd0eff1b277339

Points at the PR head; moves to the v32.0.14-<sha7> fork tag once PR 2
in nc-activity merges.

Signed-off-by: Misha M.-Kupriyanov <[email protected]>
@printminion-co

Copy link
Copy Markdown
Author

Upstreaming of this patch is now in flight — see #4 (internal review) and nextcloud#2885 (upstream). Tracked in Jira as NSW-808, parked in the "Waiting for NC/Collabora" sprint.

This PR still needs to merge as-is: the fork keeps carrying the patch on the NC32 line until Nextcloud merges and releases the upstream change. Server PR: IONOS-Productivity/ncw-server#324.

@printminion-co
printminion-co merged commit e88a751 into ionos-dev-v32 Aug 28, 2026
13 of 42 checks passed
@printminion-co
printminion-co deleted the mk/dev/NSW-946-activity-nc32 branch August 28, 2026 11:55
printminion-co added a commit to IONOS-Productivity/ncw-server that referenced this pull request Aug 28, 2026
Rebases the IONOS delegated-settings delta onto vanilla v32.0.14. The app
previously declared min-version="31" max-version="31" and would not enable
on NC32.

Upstream v32.0.14 still declares `implements ISettings`, so the IONOS
commit was reapplied rather than dropped.

PR:  IONOS-Productivity/nc-activity#2
Tag: https://github.com/IONOS-Productivity/nc-activity/releases/tag/v32.0.14-e88a751
SHA: e88a7517caf687b450681a663e89e8e55db8eee1

Signed-off-by: Misha M.-Kupriyanov <[email protected]>
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.

2 participants