Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the dehydrated device format implemented by vodozemac #4421

Merged
merged 10 commits into from
Jan 22, 2025

Conversation

uhoreg
Copy link
Member

@uhoreg uhoreg commented Dec 16, 2024

Depends on matrix-org/vodozemac#199 and ruma/ruma#1987

Fixes #4185

  • Public API changes documented in changelogs (optional)

Signed-off-by:

Copy link

codecov bot commented Dec 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.39%. Comparing base (df4b696) to head (86a89f2).
Report is 105 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4421      +/-   ##
==========================================
+ Coverage   85.38%   85.39%   +0.01%     
==========================================
  Files         284      284              
  Lines       31885    31893       +8     
==========================================
+ Hits        27225    27236      +11     
+ Misses       4660     4657       -3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@uhoreg
Copy link
Member Author

uhoreg commented Jan 4, 2025

Looks like the CI failures are due to ruma/ruma@cae7489 since I'm pulling in a newer version of ruma. I had fixed one instance, but other instances need to be fixed too.

@zecakeh
Copy link
Collaborator

zecakeh commented Jan 7, 2025

Since we want to avoid making breaking releases too often in Ruma, I would recommend using a branch based on the ruma-0.12 branch for now to avoid breaking changes. We will backport all non-breaking changes to it, allowing us to make patch releases whenever the SDK needs to make a release.

@zecakeh zecakeh mentioned this pull request Jan 8, 2025
@zecakeh
Copy link
Collaborator

zecakeh commented Jan 8, 2025

I created #4477 to upgrade Ruma with the necessary commit from ruma/ruma#1987.

@uhoreg uhoreg force-pushed the dehydration_format branch from 7e13a1b to b94bebb Compare January 9, 2025 05:53
Cargo.toml Outdated
@@ -149,6 +149,7 @@ tracing-core = { git = "https://github.com/element-hq/tracing.git", rev = "ca943
tracing-subscriber = { git = "https://github.com/element-hq/tracing.git", rev = "ca9431f74d37c9d3b5e6a9f35b2c706711dab7dd" }
tracing-appender = { git = "https://github.com/element-hq/tracing.git", rev = "ca9431f74d37c9d3b5e6a9f35b2c706711dab7dd" }
paranoid-android = { git = "https://github.com/element-hq/paranoid-android.git", rev = "69388ac5b4afeed7be4401c70ce17f6d9a2cf19b" }
vodozemac = { git = "https://github.com/uhoreg/vodozemac.git", branch = "dehydration_format" }
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@poljar do we need to make a new release of vodozemac, or should I just set the vodozemac dependency to a specific git rev?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can pin to the git rev, I'll make a release when we need it for the SDK release.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've pinned to the git rev. What do I need to do to make https://github.com/matrix-org/matrix-rust-sdk/actions/runs/12876768825/job/35900251251?pr=4421 happy?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add an exception here:

allow-git = [
# A patch override for the bindings fixing a bug for Android before upstream
# releases a new version.
"https://github.com/element-hq/tracing.git",
# Sam as for the tracing dependency.
"https://github.com/element-hq/paranoid-android.git",
# Well, it's Ruma.
"https://github.com/ruma/ruma",
# A patch override for the bindings: https://github.com/rodrimati1992/const_panic/pull/10
"https://github.com/jplatte/const_panic",
# A patch override for the bindings: https://github.com/smol-rs/async-compat/pull/22
"https://github.com/jplatte/async-compat",
]
.

@uhoreg uhoreg marked this pull request as ready for review January 20, 2025 23:02
@uhoreg uhoreg requested review from a team as code owners January 20, 2025 23:02
@uhoreg uhoreg requested review from andybalaam and removed request for a team January 20, 2025 23:02
Copy link
Member

@andybalaam andybalaam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks plausible :-) Thanks!

@poljar
Copy link
Contributor

poljar commented Jan 22, 2025

Do we want to add a changelog entry for this? Seems to be significant enough. I'll merge this now but open a PR to add a changelog entry if you agree.

@poljar poljar merged commit e826c54 into matrix-org:main Jan 22, 2025
42 checks passed
@uhoreg
Copy link
Member Author

uhoreg commented Jan 22, 2025

Do we want to add a changelog entry for this? Seems to be significant enough. I'll merge this now but open a PR to add a changelog entry if you agree.

Yes, probably. I always forget to add changelog entries.

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.

Support Device Dehydration new format
4 participants