Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Commit

Permalink
Merge pull request #240 from mvines/master
Browse files Browse the repository at this point in the history
CI overhaul follow-ups
mvines authored May 23, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 086365b + ae29641 commit 79a58da
Showing 6 changed files with 44 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Solana crate](https://img.shields.io/crates/v/solana.svg)](https://crates.io/crates/solana)
[![Solana documentation](https://docs.rs/solana/badge.svg)](https://docs.rs/solana)
[![Build Status](https://travis-ci.org/solana-labs/solana.svg?branch=master)](https://travis-ci.org/solana-labs/solana)
[![Build status](https://badge.buildkite.com/d4c4d7da9154e3a8fb7199325f430ccdb05be5fc1e92777e51.svg)](https://buildkite.com/solana-labs/solana)
[![codecov](https://codecov.io/gh/solana-labs/solana/branch/master/graph/badge.svg)](https://codecov.io/gh/solana-labs/solana)

Disclaimer
25 changes: 24 additions & 1 deletion ci/buildkite.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,37 @@
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"
label: "cuda"
- 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
12 changes: 10 additions & 2 deletions ci/coverage.sh
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions ci/test-ignored.sh
Original file line number Diff line number Diff line change
@@ -2,7 +2,8 @@

cd $(dirname $0)/..

source $HOME/.cargo/env
rustup update
rustc --version
cargo --version

export RUST_BACKTRACE=1
cargo test -- --ignored
4 changes: 3 additions & 1 deletion ci/test-nightly.sh
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion ci/test-stable.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 79a58da

Please sign in to comment.