From e56d93ab2362e547dfbc5000dad07053ea4f9c65 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Tue, 18 Dec 2018 00:37:53 -0800
Subject: [PATCH] back to nightly

---
 ci/buildkite.yml    | 2 +-
 ci/test-nightly.sh  | 5 ++---
 scripts/coverage.sh | 8 +++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ci/buildkite.yml b/ci/buildkite.yml
index d5da12727e4491..70885bf398db78 100644
--- a/ci/buildkite.yml
+++ b/ci/buildkite.yml
@@ -17,7 +17,7 @@ steps:
   #- command: "ci/docker-run.sh solanalabs/rust:1.31.0 ci/test-stable.sh"
   #  name: "stable"
   #  timeout_in_minutes: 30
-  - command: "ci/docker-run.sh solanalabs/rust:1.31.0 ci/test-nightly.sh"
+  - command: "ci/docker-run.sh solanalabs/rust-nightly:2018-12-05 ci/test-nightly.sh"
     name: "nightly"
     timeout_in_minutes: 30
   # TODO: Fix and re-enable test-large-network.sh
diff --git a/ci/test-nightly.sh b/ci/test-nightly.sh
index 56e8ad8d3bc3ff..617161e8ad3756 100755
--- a/ci/test-nightly.sh
+++ b/ci/test-nightly.sh
@@ -18,13 +18,12 @@ source ci/upload-ci-artifact.sh
 ci/version-check.sh nightly
 
 scripts/coverage.sh
+_ upload-ci-artifact target/cov/report.tar.gz
 
 echo "--- codecov.io report"
 if [[ -z "$CODECOV_TOKEN" ]]; then
   echo "^^^ +++"
   echo CODECOV_TOKEN undefined, codecov.io upload skipped
 else
-  bash <(curl -s https://codecov.io/bash) -X gcov -f lcov.info
+  bash <(curl -s https://codecov.io/bash) -X gcov -f target/cov/lcov.info
 fi
-
-_ upload-ci-artifact target/cov/report.tar.gz
diff --git a/scripts/coverage.sh b/scripts/coverage.sh
index 312563917274ce..656427335e7771 100755
--- a/scripts/coverage.sh
+++ b/scripts/coverage.sh
@@ -6,7 +6,7 @@
 #
 
 set -e
-cd "$(dirname "$0")"
+cd "$(dirname "$0")/.."
 
 _() {
   echo "--- $*"
@@ -33,10 +33,12 @@ if [[ -d target/cov ]]; then
 fi
 rm -rf target/cov/$reportName
 
+[[ -n $BUILDKITE ]] || maybeNightly="+nightly"
+
 # TODO: why does |cargo cov| "appear" to work on stable?
-_ cargo +nightly build --target-dir target/cov --all
+_ cargo $maybeNightly build --target-dir target/cov --all
 # TODO: why does |test| cause a partial rebuild?
-_ cargo +nightly test --target-dir target/cov --lib --all
+_ cargo $maybeNightly test --target-dir target/cov --lib --all
 
 _ scripts/fetch-grcov.sh
 echo "--- grcov"