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.

Sign up for GitHub

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

chore(madsim,deps): use patched sqlx managed by the madsim-rs organization instead of a personal repository #19130

Merged
merged 3 commits into from
Oct 28, 2024
Merged

chore(madsim,deps): use patched sqlx managed by the madsim-rs organization instead of a personal repository #19130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d46528
use madsim from rw
kwannoel Oct 25, 2024
9ed001f
revert parking_lot version regression
kwannoel Oct 28, 2024
11024a5
remove async_channel, remove parking_lot diffs
kwannoel Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,11 @@ getrandom = { git = "https://github.com/madsim-rs/getrandom.git", rev = "e79a7ae
# tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "0dd1055" }
tokio-retry = { git = "https://github.com/madsim-rs/rust-tokio-retry.git", rev = "95e2fd3" }
tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "ac00d88" }
# NOTE(kwannoel): patch sqlx to use a version compatible with madsim.
# If we can merge in: https://github.com/madsim-rs/sqlx/pull/2,
# we can change it to patch madsim version instead.
sqlx = { git = "https://github.com/kwannoel/sqlx.git", rev = "ddf222f56cf99f865231a5383053645c6ea05ba3" }

# sqlx version: v0.7.4
# patch diffs: https://github.com/madsim-rs/sqlx/pull/3
sqlx = { git = "https://github.com/risingwavelabs/sqlx.git", rev = "ff6d6d2dc0e9e8e47282fd29be006eed7ae3421a" }
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I pushed it to madsim, but didn't update it here 🤦 . Regardless they are using the same commit.

I will update this later when bumping sqlx to 0.8.2: #19145


futures-timer = { git = "https://github.com/madsim-rs/futures-timer.git", rev = "05b33b4" }
# patch to remove preserve_order from serde_json
bson = { git = "https://github.com/risingwavelabs/bson-rust", rev = "e5175ec" }
Expand Down
Loading