Skip to content

Commit

Permalink
chore: add platforms to hakari (#12333)
Browse files Browse the repository at this point in the history 
Signed-off-by: Runji Wang <[email protected]>
Co-authored-by: Runji Wang <[email protected]>
  • Loading branch information
@xxchan @wangrunji0408
xxchan and wangrunji0408 authored Sep 15, 2023
1 parent 7baa27f commit 59bb645
Show file tree
Hide file tree
Showing 7 changed files with 182 additions and 8 deletions.
9 changes: 4 additions & 5 deletions .config/hakari.toml
View file
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" },
]
14 changes: 14 additions & 0 deletions Cargo.lock
View file

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

13 changes: 12 additions & 1 deletion Makefile.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -946,7 +946,18 @@ set -e
cargo check \
--config "target.'cfg(all())'.rustflags = ['--cfg=madsim']" \
-p risingwave_simulation --all-targets "$@"
-p risingwave_batch \
-p risingwave_common \
-p risingwave_compute \
-p risingwave_connector \
-p risingwave_frontend \
-p risingwave_meta \
-p risingwave_object_store \
-p risingwave_source \
-p risingwave_storage \
-p risingwave_stream \
-p pgwire \
-p risingwave_simulation --tests "$@"
"""

[tasks.sslt]
Expand Down
4 changes: 3 additions & 1 deletion src/compute/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ risingwave_storage = { workspace = true }
risingwave_stream = { workspace = true }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tikv-jemalloc-ctl = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9" }
tokio = { version = "0.2", package = "madsim-tokio", features = [
"rt",
"rt-multi-thread",
Expand All @@ -54,6 +53,9 @@ tonic = { workspace = true }
tower = { version = "0.4", features = ["util", "load-shed"] }
tracing = "0.1"

[target.'cfg(unix)'.dependencies]
tikv-jemalloc-ctl = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9" }

[target.'cfg(not(madsim))'.dependencies]
workspace-hack = { path = "../workspace-hack" }

Expand Down
2 changes: 2 additions & 0 deletions src/test_runner/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ normal = ["workspace-hack"]
[dependencies]
fail = "0.5"
sync-point = { path = "../utils/sync-point" }

[target.'cfg(not(madsim))'.dependencies]
workspace-hack = { path = "../workspace-hack" }

[lints]
Expand Down
4 changes: 3 additions & 1 deletion src/tests/simulation/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,13 @@ serde_derive = "1.0.188"
serde_json = "1.0.107"
sqllogictest = "0.15.3"
tempfile = "3"
tikv-jemallocator = { workspace = true }
tokio = { version = "0.2.23", package = "madsim-tokio" }
tokio-postgres = "0.7"
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[target.'cfg(unix)'.dependencies]
tikv-jemallocator = { workspace = true }

[lints]
workspace = true
144 changes: 144 additions & 0 deletions src/workspace-hack/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,4 +215,148 @@ url = { version = "2", features = ["serde"] }
uuid = { version = "1", features = ["fast-rng", "serde", "v4"] }
zeroize = { version = "1", features = ["zeroize_derive"] }

[target.x86_64-unknown-linux-gnu.dependencies]
axum = { version = "0.6" }
memchr = { version = "2" }
mime_guess = { version = "2" }
miniz_oxide = { version = "0.7", default-features = false, features = ["with-alloc"] }
once_cell = { version = "1", features = ["unstable"] }
openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] }
opentelemetry = { version = "0.20", default-features = false, features = ["metrics", "rt-tokio", "trace"] }
opentelemetry_sdk = { version = "0.20", default-features = false, features = ["rt-tokio"] }
rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8ea07c4", default-features = false, features = ["cmake-build", "gssapi", "libz", "ssl-vendored", "zstd"] }
rustix = { version = "0.38", features = ["fs", "termios"] }
rustls = { version = "0.21", features = ["dangerous_configuration"] }
serde_json = { version = "1", default-features = false, features = ["raw_value"] }
tikv-jemalloc-sys = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] }
tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] }
tower-http = { version = "0.4", features = ["add-extension", "cors", "fs"] }
zstd-sys = { version = "2", features = ["std"] }

[target.x86_64-unknown-linux-gnu.build-dependencies]
axum = { version = "0.6" }
memchr = { version = "2" }
mime_guess = { version = "2" }
miniz_oxide = { version = "0.7", default-features = false, features = ["with-alloc"] }
once_cell = { version = "1", features = ["unstable"] }
openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] }
opentelemetry = { version = "0.20", default-features = false, features = ["metrics", "rt-tokio", "trace"] }
opentelemetry_sdk = { version = "0.20", default-features = false, features = ["rt-tokio"] }
rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8ea07c4", default-features = false, features = ["cmake-build", "gssapi", "libz", "ssl-vendored", "zstd"] }
rustix = { version = "0.38", features = ["fs", "termios"] }
rustls = { version = "0.21", features = ["dangerous_configuration"] }
serde_json = { version = "1", default-features = false, features = ["raw_value"] }
tikv-jemalloc-sys = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] }
tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] }
tower-http = { version = "0.4", features = ["add-extension", "cors", "fs"] }
zstd-sys = { version = "2", features = ["std"] }

[target.aarch64-unknown-linux-gnu.dependencies]
axum = { version = "0.6" }
memchr = { version = "2" }
mime_guess = { version = "2" }
miniz_oxide = { version = "0.7", default-features = false, features = ["with-alloc"] }
once_cell = { version = "1", features = ["unstable"] }
openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] }
opentelemetry = { version = "0.20", default-features = false, features = ["metrics", "rt-tokio", "trace"] }
opentelemetry_sdk = { version = "0.20", default-features = false, features = ["rt-tokio"] }
rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8ea07c4", default-features = false, features = ["cmake-build", "gssapi", "libz", "ssl-vendored", "zstd"] }
rustix = { version = "0.38", features = ["fs", "termios"] }
rustls = { version = "0.21", features = ["dangerous_configuration"] }
serde_json = { version = "1", default-features = false, features = ["raw_value"] }
tikv-jemalloc-sys = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] }
tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] }
tower-http = { version = "0.4", features = ["add-extension", "cors", "fs"] }
zstd-sys = { version = "2", features = ["std"] }

[target.aarch64-unknown-linux-gnu.build-dependencies]
axum = { version = "0.6" }
memchr = { version = "2" }
mime_guess = { version = "2" }
miniz_oxide = { version = "0.7", default-features = false, features = ["with-alloc"] }
once_cell = { version = "1", features = ["unstable"] }
openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] }
opentelemetry = { version = "0.20", default-features = false, features = ["metrics", "rt-tokio", "trace"] }
opentelemetry_sdk = { version = "0.20", default-features = false, features = ["rt-tokio"] }
rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8ea07c4", default-features = false, features = ["cmake-build", "gssapi", "libz", "ssl-vendored", "zstd"] }
rustix = { version = "0.38", features = ["fs", "termios"] }
rustls = { version = "0.21", features = ["dangerous_configuration"] }
serde_json = { version = "1", default-features = false, features = ["raw_value"] }
tikv-jemalloc-sys = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] }
tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] }
tower-http = { version = "0.4", features = ["add-extension", "cors", "fs"] }
zstd-sys = { version = "2", features = ["std"] }

[target.x86_64-apple-darwin.dependencies]
axum = { version = "0.6" }
memchr = { version = "2" }
mime_guess = { version = "2" }
miniz_oxide = { version = "0.7", default-features = false, features = ["with-alloc"] }
once_cell = { version = "1", features = ["unstable"] }
openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] }
opentelemetry = { version = "0.20", default-features = false, features = ["metrics", "rt-tokio", "trace"] }
opentelemetry_sdk = { version = "0.20", default-features = false, features = ["rt-tokio"] }
rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8ea07c4", default-features = false, features = ["cmake-build", "gssapi", "libz", "ssl-vendored", "zstd"] }
rustix = { version = "0.38", features = ["fs", "termios"] }
rustls = { version = "0.21", features = ["dangerous_configuration"] }
serde_json = { version = "1", default-features = false, features = ["raw_value"] }
tikv-jemalloc-sys = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] }
tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] }
tower-http = { version = "0.4", features = ["add-extension", "cors", "fs"] }
zstd-sys = { version = "2", features = ["std"] }

[target.x86_64-apple-darwin.build-dependencies]
axum = { version = "0.6" }
memchr = { version = "2" }
mime_guess = { version = "2" }
miniz_oxide = { version = "0.7", default-features = false, features = ["with-alloc"] }
once_cell = { version = "1", features = ["unstable"] }
openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] }
opentelemetry = { version = "0.20", default-features = false, features = ["metrics", "rt-tokio", "trace"] }
opentelemetry_sdk = { version = "0.20", default-features = false, features = ["rt-tokio"] }
rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8ea07c4", default-features = false, features = ["cmake-build", "gssapi", "libz", "ssl-vendored", "zstd"] }
rustix = { version = "0.38", features = ["fs", "termios"] }
rustls = { version = "0.21", features = ["dangerous_configuration"] }
serde_json = { version = "1", default-features = false, features = ["raw_value"] }
tikv-jemalloc-sys = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] }
tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] }
tower-http = { version = "0.4", features = ["add-extension", "cors", "fs"] }
zstd-sys = { version = "2", features = ["std"] }

[target.aarch64-apple-darwin.dependencies]
axum = { version = "0.6" }
memchr = { version = "2" }
mime_guess = { version = "2" }
miniz_oxide = { version = "0.7", default-features = false, features = ["with-alloc"] }
once_cell = { version = "1", features = ["unstable"] }
openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] }
opentelemetry = { version = "0.20", default-features = false, features = ["metrics", "rt-tokio", "trace"] }
opentelemetry_sdk = { version = "0.20", default-features = false, features = ["rt-tokio"] }
rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8ea07c4", default-features = false, features = ["cmake-build", "gssapi", "libz", "ssl-vendored", "zstd"] }
rustix = { version = "0.38", features = ["fs", "termios"] }
rustls = { version = "0.21", features = ["dangerous_configuration"] }
serde_json = { version = "1", default-features = false, features = ["raw_value"] }
tikv-jemalloc-sys = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] }
tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] }
tower-http = { version = "0.4", features = ["add-extension", "cors", "fs"] }
zstd-sys = { version = "2", features = ["std"] }

[target.aarch64-apple-darwin.build-dependencies]
axum = { version = "0.6" }
memchr = { version = "2" }
mime_guess = { version = "2" }
miniz_oxide = { version = "0.7", default-features = false, features = ["with-alloc"] }
once_cell = { version = "1", features = ["unstable"] }
openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] }
opentelemetry = { version = "0.20", default-features = false, features = ["metrics", "rt-tokio", "trace"] }
opentelemetry_sdk = { version = "0.20", default-features = false, features = ["rt-tokio"] }
rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka", rev = "8ea07c4", default-features = false, features = ["cmake-build", "gssapi", "libz", "ssl-vendored", "zstd"] }
rustix = { version = "0.38", features = ["fs", "termios"] }
rustls = { version = "0.21", features = ["dangerous_configuration"] }
serde_json = { version = "1", default-features = false, features = ["raw_value"] }
tikv-jemalloc-sys = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] }
tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9", features = ["profiling", "stats", "unprefixed_malloc_on_supported_platforms"] }
tower-http = { version = "0.4", features = ["add-extension", "cors", "fs"] }
zstd-sys = { version = "2", features = ["std"] }

### END HAKARI SECTION

0 comments on commit 59bb645

Please sign in to comment.