From ae29641a18e37a4b68c4013c48f336cbd862e573 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Tue, 22 May 2018 16:57:14 -0700
Subject: [PATCH] Run most CI steps in docker

---
 ci/buildkite.yml   | 25 ++++++++++++++++++++++++-
 ci/coverage.sh     | 12 ++++++++++--
 ci/test-ignored.sh |  5 +++--
 ci/test-nightly.sh |  4 +++-
 ci/test-stable.sh  |  4 +++-
 5 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/ci/buildkite.yml b/ci/buildkite.yml
index e6eb08c98..7fef0ef74 100644
--- a/ci/buildkite.yml
+++ b/ci/buildkite.yml
@@ -1,10 +1,26 @@
 steps:
   - command: "ci/coverage.sh"
-    label: "coverage [public]"
+    label: "coverage"
+    # TODO: Run coverage in a docker image rather than assuming kcov/cargo-kcov
+    #       is installed on the build agent...
+    #plugins:
+    #  docker#v1.1.1:
+    #    image: "rust"
+    #    user: "998:997" # buildkite-agent:buildkite-agent
+    #    environment:
+    #      - CODECOV_TOKEN=$CODECOV_TOKEN
   - command: "ci/test-stable.sh"
     label: "stable [public]"
+    plugins:
+      docker#v1.1.1:
+        image: "rust"
+        user: "998:997" # buildkite-agent:buildkite-agent
   - command: "ci/test-nightly.sh || true"
     label: "nightly - FAILURES IGNORED [public]"
+    plugins:
+      docker#v1.1.1:
+        image: "rustlang/rust:nightly"
+        user: "998:997" # buildkite-agent:buildkite-agent
   - command: "ci/test-ignored.sh || true"
     label: "ignored - FAILURES IGNORED [public]"
   - command: "ci/test-cuda.sh"
@@ -12,3 +28,10 @@ steps:
   - wait
   - command: "ci/publish.sh"
     label: "publish release artifacts"
+    plugins:
+      docker#v1.1.1:
+        image: "rust"
+        user: "998:997" # buildkite-agent:buildkite-agent
+        environment:
+          - BUILDKITE_TAG=$BUILDKITE_TAG
+          - CRATES_IO_TOKEN=$CRATES_IO_TOKEN
diff --git a/ci/coverage.sh b/ci/coverage.sh
index 8a5a67484..b65747997 100755
--- a/ci/coverage.sh
+++ b/ci/coverage.sh
@@ -2,8 +2,16 @@
 
 cd $(dirname $0)/..
 
-source $HOME/.cargo/env
-rustup update
+if [[ -r ~/.cargo/env ]]; then
+  # Pick up local install of kcov/cargo-kcov
+  source ~/.cargo/env
+fi
+
+rustc --version
+cargo --version
+kcov --version
+cargo-kcov --version
+
 export RUST_BACKTRACE=1
 cargo build
 cargo kcov
diff --git a/ci/test-ignored.sh b/ci/test-ignored.sh
index c317e645f..832c72a02 100755
--- a/ci/test-ignored.sh
+++ b/ci/test-ignored.sh
@@ -2,7 +2,8 @@
 
 cd $(dirname $0)/..
 
-source $HOME/.cargo/env
-rustup update
+rustc --version
+cargo --version
+
 export RUST_BACKTRACE=1
 cargo test -- --ignored
diff --git a/ci/test-nightly.sh b/ci/test-nightly.sh
index c3bc4cf7b..022d7f4c4 100755
--- a/ci/test-nightly.sh
+++ b/ci/test-nightly.sh
@@ -2,7 +2,9 @@
 
 cd $(dirname $0)/..
 
-source $HOME/.cargo/env
+rustc --version
+cargo --version
+
 rustup component add rustfmt-preview
 cargo fmt -- --write-mode=diff
 cargo build --verbose --features unstable
diff --git a/ci/test-stable.sh b/ci/test-stable.sh
index c4c179a47..31dbbda32 100755
--- a/ci/test-stable.sh
+++ b/ci/test-stable.sh
@@ -2,7 +2,9 @@
 
 cd $(dirname $0)/..
 
-source $HOME/.cargo/env
+rustc --version
+cargo --version
+
 rustup component add rustfmt-preview
 cargo fmt -- --write-mode=diff
 cargo build --verbose