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

Commit ae29641

Browse files
committed
Run most CI steps in docker
1 parent 9c3f65b commit ae29641

File tree

5 files changed

+43
-7
lines changed

5 files changed

+43
-7
lines changed

ci/buildkite.yml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,37 @@
11
steps:
22
- command: "ci/coverage.sh"
3-
label: "coverage [public]"
3+
label: "coverage"
4+
# TODO: Run coverage in a docker image rather than assuming kcov/cargo-kcov
5+
# is installed on the build agent...
6+
#plugins:
7+
# docker#v1.1.1:
8+
# image: "rust"
9+
# user: "998:997" # buildkite-agent:buildkite-agent
10+
# environment:
11+
# - CODECOV_TOKEN=$CODECOV_TOKEN
412
- command: "ci/test-stable.sh"
513
label: "stable [public]"
14+
plugins:
15+
docker#v1.1.1:
16+
image: "rust"
17+
user: "998:997" # buildkite-agent:buildkite-agent
618
- command: "ci/test-nightly.sh || true"
719
label: "nightly - FAILURES IGNORED [public]"
20+
plugins:
21+
docker#v1.1.1:
22+
image: "rustlang/rust:nightly"
23+
user: "998:997" # buildkite-agent:buildkite-agent
824
- command: "ci/test-ignored.sh || true"
925
label: "ignored - FAILURES IGNORED [public]"
1026
- command: "ci/test-cuda.sh"
1127
label: "cuda"
1228
- wait
1329
- command: "ci/publish.sh"
1430
label: "publish release artifacts"
31+
plugins:
32+
docker#v1.1.1:
33+
image: "rust"
34+
user: "998:997" # buildkite-agent:buildkite-agent
35+
environment:
36+
- BUILDKITE_TAG=$BUILDKITE_TAG
37+
- CRATES_IO_TOKEN=$CRATES_IO_TOKEN

ci/coverage.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,16 @@
22

33
cd $(dirname $0)/..
44

5-
source $HOME/.cargo/env
6-
rustup update
5+
if [[ -r ~/.cargo/env ]]; then
6+
# Pick up local install of kcov/cargo-kcov
7+
source ~/.cargo/env
8+
fi
9+
10+
rustc --version
11+
cargo --version
12+
kcov --version
13+
cargo-kcov --version
14+
715
export RUST_BACKTRACE=1
816
cargo build
917
cargo kcov

ci/test-ignored.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
cd $(dirname $0)/..
44

5-
source $HOME/.cargo/env
6-
rustup update
5+
rustc --version
6+
cargo --version
7+
78
export RUST_BACKTRACE=1
89
cargo test -- --ignored

ci/test-nightly.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
cd $(dirname $0)/..
44

5-
source $HOME/.cargo/env
5+
rustc --version
6+
cargo --version
7+
68
rustup component add rustfmt-preview
79
cargo fmt -- --write-mode=diff
810
cargo build --verbose --features unstable

ci/test-stable.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
cd $(dirname $0)/..
44

5-
source $HOME/.cargo/env
5+
rustc --version
6+
cargo --version
7+
68
rustup component add rustfmt-preview
79
cargo fmt -- --write-mode=diff
810
cargo build --verbose

0 commit comments

Comments
 (0)