From cf3bbc09b67165d627115746077c477eb0cbdcb9 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Thu, 3 Oct 2019 19:05:44 -0700 Subject: [PATCH] Jump to nightly-2019-10-03 (#6233) * Reduce what gets build for coverage to avoid OoM with nightly 2019-10-03 * Update nightly to 2019-10-03 --- ci/docker-rust-nightly/Dockerfile | 2 +- ci/rust-version.sh | 2 +- scripts/coverage.sh | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ci/docker-rust-nightly/Dockerfile b/ci/docker-rust-nightly/Dockerfile index 29f7c7d61..8972023e1 100644 --- a/ci/docker-rust-nightly/Dockerfile +++ b/ci/docker-rust-nightly/Dockerfile @@ -1,4 +1,4 @@ -FROM solanalabs/rust +FROM solanalabs/rust:1.38.0 ARG date RUN set -x \ diff --git a/ci/rust-version.sh b/ci/rust-version.sh index 35e373774..07ca557d7 100644 --- a/ci/rust-version.sh +++ b/ci/rust-version.sh @@ -14,7 +14,7 @@ # stable_version=1.38.0 -nightly_version=2019-09-25 +nightly_version=2019-10-03 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 3574895f4..d0c8435e2 100755 --- a/scripts/coverage.sh +++ b/scripts/coverage.sh @@ -37,8 +37,6 @@ rm -rf target/cov/$reportName source ci/rust-version.sh nightly # shellcheck disable=SC2086 # -_ cargo +$rust_nightly build --tests --bins --target-dir target/cov $crate -# shellcheck disable=SC2086 # _ cargo +$rust_nightly test --target-dir target/cov --lib $crate echo "--- grcov"