[stable32] fix(sync): increment the version after applying the steps#7745
Merged
max-nextcloud merged 5 commits intostable32from Oct 9, 2025
Merged
[stable32] fix(sync): increment the version after applying the steps#7745max-nextcloud merged 5 commits intostable32from
max-nextcloud merged 5 commits intostable32from
Conversation
Remove the delegations to only use the typed interface. Signed-off-by: Max <max@nextcloud.com>
Signed-off-by: Max <max@nextcloud.com>
* Hand versions alongside the actual step. * Increase sync service version when processing the next step. * Keep track of the step that is currently processed and provide better `warn` logging when steps are not processed. * Add types to WebsocketPolyfill and its test. Signed-off-by: Max <max@nextcloud.com>
Drop the `FlatStep` type. Process each version iterating through its data. Increment the version counter afterwards. Signed-off-by: Max <max@nextcloud.com>
* First is logged as error. * Second is logged as debug and can be tracked with conditional logging. Signed-off-by: Jonas <jonas@freesources.org> Signed-off-by: Max <max@nextcloud.com>
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## stable32 #7745 +/- ##
============================================
- Coverage 59.33% 59.27% -0.07%
============================================
Files 502 503 +1
Lines 39207 39222 +15
Branches 1140 1136 -4
============================================
- Hits 23264 23248 -16
- Misses 15835 15866 +31
Partials 108 108 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
max-nextcloud
approved these changes
Oct 9, 2025
Collaborator
|
/backport to stable31 |
Author
|
The backport to # Switch to the target branch and update it
git checkout stable31
git pull origin stable31
# Create the new backport branch
git checkout -b backport/7745/stable31
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 4bf57315 8d28b0b5 ad437706 161d20db 865a18b6
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/7745/stable31Error: Failed to check for changes with origin/stable31: No changes found in backport branch Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of PR #7701