Skip to content

Commit

Permalink
Use custom rust nightly image with cargo-cov and clippy pre-installed
Browse files Browse the repository at this point in the history
  • Loading branch information
mvines authored and garious committed Jul 12, 2018
1 parent 350cf62 commit 84c28a0
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ci/buildkite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ steps:
- command: "ci/shellcheck.sh"
name: "shellcheck [public]"
timeout_in_minutes: 20
- command: "ci/docker-run.sh rustlang/rust:nightly ci/test-nightly.sh"
- command: "ci/docker-run.sh solanalabs/rust-nightly ci/test-nightly.sh"
name: "nightly [public]"
env:
CARGO_TARGET_CACHE_NAME: "nightly"
Expand Down
3 changes: 3 additions & 0 deletions ci/docker-rust-nightly/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM rustlang/rust:nightly

RUN cargo install --force clippy cargo-cov
6 changes: 6 additions & 0 deletions ci/docker-rust-nightly/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Docker image containing rust nightly and some preinstalled crates used in CI.

This image may be manually updated by running `./build.sh` if you are a member
of the [Solana Labs](https://hub.docker.com/u/solanalabs/) Docker Hub
organization, but it is also automatically updated periodically by
[this automation](https://buildkite.com/solana-labs/solana-ci-docker-rust-nightly).
6 changes: 6 additions & 0 deletions ci/docker-rust-nightly/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash -ex

cd "$(dirname "$0")"

docker build -t solanalabs/rust-nightly .
docker push solanalabs/rust-nightly
1 change: 0 additions & 1 deletion ci/test-nightly.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ _ cargo test --verbose --features unstable
exit 0

# Coverage disabled (see issue #433)
_ cargo install --force cargo-cov
_ cargo cov test
_ cargo cov report

Expand Down

0 comments on commit 84c28a0

Please sign in to comment.