Skip to content

Commit 32c5b30

Browse files
committed
Improve CI to avoid toolchain downloads
1 parent bffaecf commit 32c5b30

File tree

1 file changed

+11
-25
lines changed

1 file changed

+11
-25
lines changed

.cirrus.yml

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,29 @@
11
clippy_task:
22
container:
33
image: rust:latest
4-
keyutils_script: apt-get update && apt-get install libkeyutils-dev
54
component_script: rustup component add clippy
6-
fmt_script: cargo clippy
7-
toolchain_cache:
8-
folder: $RUSTUP_HOME
9-
fingerprint_script: rustc --version
10-
cargo_cache:
11-
folder: $CARGO_HOME/registry
12-
fingerprint_script: cat Cargo.lock
5+
clippy_script: cargo clippy
136

147
rustfmt_task:
158
container:
9+
# Our .rustfmt.toml uses currently unstable features
1610
image: rustlang/rust:nightly
17-
keyutils_script: apt-get update && apt-get install libkeyutils-dev
1811
component_script: rustup component add rustfmt
1912
fmt_script: cargo fmt --all -- --check
2013

2114
linux_task:
22-
container:
23-
image: rust:latest
2415
matrix:
25-
- env:
26-
RUSTVER: 1.32.0
27-
- env:
28-
RUSTVER: stable
29-
- allow_failures: true
30-
env:
31-
RUSTVER: nightly
16+
- container:
17+
image: rust:1.32.0
18+
- container:
19+
image: rust:latest
20+
- allow_failures: true
21+
container:
22+
image: rustlang/rust:nightly
3223
keyutils_script: apt-get update && apt-get install libkeyutils-dev
33-
rustup_script: rustup toolchain install $RUSTVER
34-
toolchain_cache:
35-
folder: $RUSTUP_HOME
36-
fingerprint_script: rustc +$RUSTVER --version
37-
update_script: cargo +$RUSTVER update
3824
cargo_cache:
3925
folder: $CARGO_HOME/registry
4026
fingerprint_script: cat Cargo.lock
41-
build_script: cargo +$RUSTVER build
42-
test_script: cargo +$RUSTVER test
27+
build_script: cargo build
28+
test_script: cargo test
4329
before_cache_script: rm -rf $CARGO_HOME/registry/index

0 commit comments

Comments
 (0)