diff --git a/ci/rust-version.sh b/ci/rust-version.sh index 8aedcc1139..f818f6fed8 100644 --- a/ci/rust-version.sh +++ b/ci/rust-version.sh @@ -13,8 +13,18 @@ # $ source ci/rust-version.sh # -stable_version=1.39.0 -nightly_version=2019-11-13 +if [[ -n $RUST_STABLE_VERSION ]]; then + stable_version="$RUST_STABLE_VERSION" +else + stable_version=1.39.0 +fi + +if [[ -n $RUST_NIGHTLY_VERSION ]]; then + nightly_version="$RUST_NIGHTLY_VERSION" +else + nightly_version=2019-11-13 +fi + export rust_stable="$stable_version" export rust_stable_docker_image=solanalabs/rust:"$stable_version" diff --git a/scripts/coverage.sh b/scripts/coverage.sh index fe7281e54c..1063d61986 100755 --- a/scripts/coverage.sh +++ b/scripts/coverage.sh @@ -13,7 +13,7 @@ source ci/_ reportName="lcov-${CI_COMMIT:0:9}" if [[ -z $1 ]]; then - packages=( --lib --all --exclude solana-local-cluster ) + packages=( --lib --all --exclude solana-local-cluster ) else packages=( "$@" ) fi @@ -24,7 +24,7 @@ coverageFlags+=("-Ccodegen-units=1") # Disable code generation parallelism w coverageFlags+=("-Cinline-threshold=0") # Disable inlining, which complicates control flow. coverageFlags+=("-Coverflow-checks=off") # Disable overflow checks, which create unnecessary branches. -export RUSTFLAGS="${coverageFlags[*]}" +export RUSTFLAGS="${coverageFlags[*]} $RUSTFLAGS" export CARGO_INCREMENTAL=0 export RUST_BACKTRACE=1 export RUST_MIN_STACK=8388608