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

fix(risedev): unexpected rebuilds on Linux #3761

Merged
merged 3 commits into from
Jul 10, 2022
Merged

fix(risedev): unexpected rebuilds on Linux #3761

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
1bc9364
fix(risedev): unexpected rebuilds on Linux
skyzh Jul 9, 2022
b97d689
update workspace hack
skyzh Jul 9, 2022
a123af2
use bash instead of fish
BugenZhao Jul 10, 2022
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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

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

7 changes: 3 additions & 4 deletions Makefile.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ if ${is_sanitizer_enabled}
else
set_env RISEDEV_CARGO_BUILD_EXTRA_ARGS ""
set_env RISEDEV_BUILD_TARGET_DIR ""
set_env RISEDEV_RUSTFLAGS "--cfg tokio_unstable"
end

if ${is_all_in_one_enabled}
Expand Down Expand Up @@ -213,13 +212,13 @@ category = "RiseDev - Build"
description = "Build Rust components"
condition = { env_set = ["ENABLE_BUILD_RUST"] }
script = '''
#!@shell
#!/bin/bash

set -e
echo "$(tput setaf 4)$(tput bold)[Reminder]$(tput sgr0) risedev will only build $(tput setaf 4)risingwave_cmd(_all) and risedev$(tput sgr0) crates."

export RUSTFLAGS="${RISEDEV_RUSTFLAGS}"
echo + RUSTFLAGS="$RUSTFLAGS"
[[ -z "${RISEDEV_RUSTFLAGS}" ]] || export RUSTFLAGS="${RISEDEV_RUSTFLAGS}"
echo + RUSTFLAGS="${RUSTFLAGS:-<not set>}"
set -xe
cargo build -p ${RISEDEV_CARGO_BUILD_CRATE} -p risedev \
--profile "${RISINGWAVE_BUILD_PROFILE}" \
Expand Down
1 change: 1 addition & 0 deletions src/test_runner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ edition = "2021"

[dependencies]
fail = "0.5"
workspace-hack = { version = "0.1", path = "../workspace-hack" }
2 changes: 0 additions & 2 deletions src/workspace-hack/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ futures-io = { version = "0.3", features = ["std"] }
futures-sink = { version = "0.3", features = ["alloc", "std"] }
futures-task = { version = "0.3", default-features = false, features = ["alloc", "std"] }
futures-util = { version = "0.3", features = ["alloc", "async-await", "async-await-macro", "channel", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "sink", "slab", "std"] }
hashbrown = { version = "0.11", features = ["ahash", "inline-more", "nightly", "raw"] }
hyper = { version = "0.14", features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] }
indexmap = { version = "1", default-features = false, features = ["std"] }
isahc = { version = "1", default-features = false, features = ["encoding_rs", "mime", "text-decoding"] }
Expand Down Expand Up @@ -98,7 +97,6 @@ futures-io = { version = "0.3", features = ["std"] }
futures-sink = { version = "0.3", features = ["alloc", "std"] }
futures-task = { version = "0.3", default-features = false, features = ["alloc", "std"] }
futures-util = { version = "0.3", features = ["alloc", "async-await", "async-await-macro", "channel", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "sink", "slab", "std"] }
hashbrown = { version = "0.11", features = ["ahash", "inline-more", "nightly", "raw"] }
hyper = { version = "0.14", features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] }
indexmap = { version = "1", default-features = false, features = ["std"] }
isahc = { version = "1", default-features = false, features = ["encoding_rs", "mime", "text-decoding"] }
Expand Down