Go back to depending on matrix-rust-sdk main branch #184
Conversation
This file contains 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
andybalaam
requested review from
uhoreg and
richvdh
and removed request for
uhoreg
richvdh
reviewed
Dec 19, 2024
Cargo.lock
Outdated
| @@ -1045,7 +1045,7 @@ dependencies = [ | |||
| [[package]] | |||
| name = "matrix-sdk-common" | |||
| version = "0.8.0" | |||
| source = "git+https://github.com/matrix-org/matrix-rust-sdk?branch=release-for-crypto-wasm-12#37c17cf854a70fe6f719c7fde49a6b0e4402988f" | |||
| source = "git+https://github.com/matrix-org/matrix-rust-sdk#e99939db857ca36054c0023ef68cc181236fdee4" | |||
There was a problem hiding this comment.
can we do this without rolling back the rust-sdk? ie, just:
Suggested change
| source = "git+https://github.com/matrix-org/matrix-rust-sdk#e99939db857ca36054c0023ef68cc181236fdee4" | |
| source = "git+https://github.com/matrix-org/matrix-rust-sdk#37c17cf854a70fe6f719c7fde49a6b0e4402988f" |
(likewise below)
There was a problem hiding this comment.
Good idea. I force-pushed since adding a commit would be more confusing imo.
andybalaam
force-pushed
the
andybalaam/back-to-main-rust-sdk-branch
branch
from
007f68f to
e01559c
Compare
andybalaam
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This undoes the change made in 0378300, except it stays on the same commit SHA of matrix-rust-sdk, but changes the branch specifier.
We temporarily switched to the branch
release-for-crypto-wasm-12ofmatrix-rust-sdkto release 12.1.0 without needing to fix the other things needing work to get the latestmatrix-rust-sdk. This change puts us back onto the main branch, as normal.