diff --git a/ci/test-stable.sh b/ci/test-stable.sh index e99309d49..711a3a580 100755 --- a/ci/test-stable.sh +++ b/ci/test-stable.sh @@ -74,6 +74,7 @@ test-stable-perf) # shellcheck source=/dev/null source ./target/perf-libs/env.sh ROOT_FEATURES=cuda + export SOLANA_CUDA=1 fi # Run root package library tests @@ -91,11 +92,9 @@ test-local-cluster) ;; esac -# Assumes target/debug is populated. Ensure last build command -# leaves target/debug in the state intended for localnet-sanity echo --- ci/localnet-sanity.sh +export CARGO_TOOLCHAIN=+"$rust_stable" ( set -x - export PATH=$PWD/target/debug:$PATH - USE_INSTALL=1 ci/localnet-sanity.sh -x + ci/localnet-sanity.sh -x ) diff --git a/multinode-demo/common.sh b/multinode-demo/common.sh index e634c3a32..cd364c50b 100644 --- a/multinode-demo/common.sh +++ b/multinode-demo/common.sh @@ -55,8 +55,8 @@ else if [[ -n $NDEBUG ]]; then maybe_release=--release fi - declare manifest_path="--manifest-path=$SOLANA_ROOT/Cargo.toml" - printf "cargo run $manifest_path $maybe_release $maybe_package --bin %s %s -- " "$program" "$features" + declare manifest_path="--manifest-path=$SOLANA_ROOT/$crate/Cargo.toml" + printf "cargo $CARGO_TOOLCHAIN run $manifest_path $maybe_release $maybe_package --bin %s %s -- " "$program" "$features" } fi