Skip to content

Commit

Permalink
Merge branch 'risingwavelabs:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Rossil2012 authored Sep 16, 2023
2 parents c438327 + 31fdc26 commit 844172e
Show file tree
Hide file tree
Showing 63 changed files with 1,142 additions and 673 deletions.
9 changes: 4 additions & 5 deletions .config/hakari.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ resolver = "2"
# Add triples corresponding to platforms commonly used by developers here.
# https://doc.rust-lang.org/rustc/platform-support.html
platforms = [
# "x86_64-unknown-linux-gnu",
# "x86_64-apple-darwin",
# "x86_64-pc-windows-msvc",
"x86_64-unknown-linux-gnu",
"aarch64-unknown-linux-gnu",
"x86_64-apple-darwin",
"aarch64-apple-darwin",
]

# Write out exact versions rather than a semver range. (Defaults to false.)
Expand All @@ -35,6 +36,4 @@ third-party = [
{ name = "criterion" },
{ name = "console" },
{ name = "similar" },
# FYI: https://github.com/risingwavelabs/risingwave/issues/12315
{ name = "tikv-jemalloc-sys", git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9" },
]
Loading

0 comments on commit 844172e

Please sign in to comment.