fix(risedev): unexpected rebuilds on Linux (#3761)

* fix(risedev): unexpected rebuilds on Linux Signed-off-by: Alex Chi <iskyzh@gmail.com> * update workspace hack Signed-off-by: Alex Chi <iskyzh@gmail.com> * use bash instead of fish Co-authored-by: Bugen Zhao <i@bugenzhao.com>
risingwavelabs · Jul 10, 2022 · 208ab51 · 208ab51
1 parent 301499f
commit 208ab51
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile.toml b/Makefile.toml
@@ -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}
@@ -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}" \

diff --git a/src/test_runner/Cargo.toml b/src/test_runner/Cargo.toml
@@ -6,3 +6,4 @@ edition = "2021"
 
 [dependencies]
 fail = "0.5"
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml
@@ -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"] }
@@ -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"] }
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" }