[BUGFIX][deps] Explicitly set patched version of sqlx #6047
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
Sui's dependency on `sqlx` needs to be overridden with a patched version that uses a more recent version of `libsqlite3-sys`. The previous approach used a `patch` configuration in the root `Cargo.toml`. This works for builds within this project, but seems to break for builds that originate from outside the workspace, but depend on one of the workspace crates. In this scenario, the patch doesn't apply on the dependency on `sqlx` in `sui-storage`, so it ends up conflicting with the dependency in `workspace-hack`. The most common example of this is someone depending on the Rust SDK (`sui-sdk`). This diff ditches the `patch` and sets the dependency override explicitly on `sui-storage`. Test Plan: Sui builds and runs: ``` sui$ cargo build sui$ cargo simtest sui$ cargo nextest run ``` Dependents on the Sui SDK build and run, e.g. following the instructions at https://docs.sui.io/build/rust-sdk succeeds. Closes MystenLabs#5887
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.
Sui's dependency on
sqlxneeds to be overridden with a patched version that uses a more recent version oflibsqlite3-sys. The previous approach used apatchconfiguration in the rootCargo.toml.This works for builds within this project, but seems to break for builds that originate from outside the workspace, but depend on one of the workspace crates.
In this scenario, the patch doesn't apply on the dependency on
sqlxinsui-storage, so it ends up conflicting with the dependency inworkspace-hack.The most common example of this is someone depending on the Rust SDK (
sui-sdk).This diff ditches the
patchand sets the dependency override explicitly onsui-storage.Test Plan
Sui builds and runs:
Dependents on the Sui SDK build and run, e.g. following the instructions at https://docs.sui.io/build/rust-sdk succeeds.
Closes #5887