Merge remote-tracking branch 'origin/main' into xx/compaction-inherit…

…ance
risingwavelabs · Sep 15, 2023 · 461923d · 461923d
2 parents f5a49d4 + 0032145
commit 461923d
Show file tree

Hide file tree

Showing 61 changed files with 1,084 additions and 664 deletions.
diff --git a/.config/hakari.toml b/.config/hakari.toml
@@ -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.)
@@ -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" },
 ]