Skip to content

Port #10252 back manually to stable-33.0 - #10256

Merged
i2h3 merged 3 commits into
stable-33.0from
backport/10252/stable-33.0
Jun 26, 2026
Merged

Port #10252 back manually to stable-33.0#10256
i2h3 merged 3 commits into
stable-33.0from
backport/10252/stable-33.0

Conversation

@i2h3

@i2h3 i2h3 commented Jun 25, 2026

Copy link
Copy Markdown
Collaborator

Checklist

AI (if applicable)

@i2h3 i2h3 added this to the 33.0.7 milestone Jun 25, 2026
@i2h3 i2h3 self-assigned this Jun 25, 2026
@i2h3 i2h3 added the bug label Jun 25, 2026
@i2h3 i2h3 added os: 🍎 macOS Apple macOS, formerly also known as OS X feature: 📁 file provider macOS File Provider Extension, more general also known as virtual file system. labels Jun 25, 2026
@github-project-automation github-project-automation Bot moved this to 🧭 Planning evaluation (don't pick) in 💻 Desktop Clients team Jun 25, 2026
@i2h3 i2h3 moved this from 🧭 Planning evaluation (don't pick) to 🏗️ In progress in 💻 Desktop Clients team Jun 25, 2026
i2h3 and others added 3 commits June 26, 2026 09:03
…ogic

Signed-off-by: Iva Horn <[email protected]>
(cherry picked from commit dd22b8b)
…le-33.0

The SwiftPM test target did not compile on stable-33.0, independent of any
single change, due to two partial-backport drifts:

- MoveSafeDeletionTests used Enumerator.syncAnchor(at:), a helper introduced by
  the version-tagged sync anchor work (#10065) that was never backported to
  stable-33.0. Build the plain ISO8601 NSFileProviderSyncAnchor directly, as the
  other tests on this branch already do.
- ItemPropertyTests' allowsExcludingFromSync test constructed an Item without the
  displayFileActions argument, which became a required Item.init parameter on
  stable-33.0; the other call sites pass it but this one was missed. Pass
  displayFileActions: false to match.

No production code is affected. Full test target now builds and passes.

Signed-off-by: Iva Horn <[email protected]>

Co-Authored-By: Claude Opus 4.8 <[email protected]>
…ches

The workflow only triggered on master, so for pull_request events (which use the
base branch's workflow + branch filter) backport PRs targeting stable-* never ran
the SwiftFormat lint or the xcodebuild test job. That is how partial backports left
the stable-33.0 test target uncompilable behind green checks. Add the stable-* glob
to both the push and pull_request branch filters so the kit is built and tested on
stable branches too.

Signed-off-by: Iva Horn <[email protected]>

Co-Authored-By: Claude Opus 4.8 <[email protected]>
@i2h3
i2h3 force-pushed the backport/10252/stable-33.0 branch from 4f5c82f to 55f39e2 Compare June 26, 2026 07:03
@github-actions

Copy link
Copy Markdown
Contributor

Artifact containing the AppImage: nextcloud-appimage-pr-10256.zip

Digest: sha256:05154c91d8359f28511bc59a221ce0042b603afd7159aae76f73311e46217279

To test this change/fix you can download the above artifact file, unzip it, and run it.

Please make sure to quit your existing Nextcloud app and backup your data.

@i2h3
i2h3 merged commit 798c85b into stable-33.0 Jun 26, 2026
21 checks passed
@i2h3
i2h3 deleted the backport/10252/stable-33.0 branch June 26, 2026 07:36
@github-project-automation github-project-automation Bot moved this from 🏗️ In progress to ☑️ Done in 💻 Desktop Clients team Jun 26, 2026
@sonarqubecloud

Copy link
Copy Markdown

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

Labels

bug feature: 📁 file provider macOS File Provider Extension, more general also known as virtual file system. os: 🍎 macOS Apple macOS, formerly also known as OS X

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants