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 15, 2023
2 parents ae77506 + 43c010e commit 621ec6d
Show file tree
Hide file tree
Showing 184 changed files with 3,890 additions and 1,699 deletions.
1 change: 0 additions & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ rustflags = [
]

[target.aarch64-apple-darwin]
runner = "scripts/coredump/sign-and-run"
rustflags = [
# neon is enabled by default
"-Clink-arg=-fuse-ld=/opt/homebrew/opt/llvm/bin/ld64.lld",
Expand Down
2 changes: 2 additions & 0 deletions .config/hakari.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,6 @@ 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 621ec6d

Please sign in to comment.