Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit 8ee1721

Browse files
authored
Merge pull request #1534 from Xanewok/travis-fix-rustfmt
Travis: Pin nightly version for Rustfmt
2 parents d4b595a + 171cc49 commit 8ee1721

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

.travis.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ cache:
55
rust:
66
- nightly
77
install:
8-
- rustup component add rustfmt
8+
# Use last well-known nightly for Rustfmt
9+
- rustup toolchain install nightly-2019-08-01
10+
- rustup component add rustfmt --toolchain nightly-2019-08-01
911
# Required for Racer autoconfiguration
1012
- rustup component add rust-src
1113
- rustup component add rust-analysis
@@ -19,18 +21,18 @@ matrix:
1921
if: commit_message =~ /(?i:^update.*\b(clippy)\b)/
2022
script:
2123
- |
22-
if [ ${CLIPPY} = true ]; then
24+
if [ "${CLIPPY}" = true ]; then
2325
cargo build -v --features "clippy"
2426
cargo test -v --features "clippy"
2527
else
2628
# Since the rls-* subcrates use crates.io-based dependencies of themselves it
2729
# makes sense to test them in isolation rather than just RLS itself
28-
(cd rls-analysis && cargo test -v && cargo fmt -- --check)
29-
(cd rls-data && cargo test -v && cargo fmt -- --check)
30-
(cd rls-rustc && cargo test -v && cargo fmt -- --check)
31-
(cd rls-span && cargo test -v && cargo fmt -- --check)
32-
(cd rls-vfs && cargo test -v && cargo fmt -- --check)
33-
cargo fmt -- --check
30+
(cd rls-analysis && cargo test -v && cargo +nightly-2019-08-01 fmt -- --check)
31+
(cd rls-data && cargo test -v && cargo +nightly-2019-08-01 fmt -- --check)
32+
(cd rls-rustc && cargo test -v && cargo +nightly-2019-08-01 fmt -- --check)
33+
(cd rls-span && cargo test -v && cargo +nightly-2019-08-01 fmt -- --check)
34+
(cd rls-vfs && cargo test -v && cargo +nightly-2019-08-01 fmt -- --check)
35+
cargo +nightly-2019-08-01 fmt -- --check
3436
cargo build -v
3537
cargo test -v
3638
cargo test test_tooltip_std -- --ignored

0 commit comments

Comments
 (0)