Skip to content

Commit fd54f44

Browse files
authored
Merge pull request #3486 from phansch/make_windows_travis_run_more_stuff
Travis: Add rustc sysroot bin to PATH for windows build
2 parents b06594e + 39f179d commit fd54f44

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ matrix:
5252
- os: linux
5353
env: BASE_TESTS=true
5454
- os: windows
55-
env: BASE_TESTS=true
55+
env: CARGO_INCREMENTAL=0 BASE_TESTS=true
5656
- env: INTEGRATION=rust-lang/cargo
5757
if: repo =~ /^rust-lang\/rust-clippy$/
5858
- env: INTEGRATION=rust-random/rand
@@ -81,7 +81,7 @@ matrix:
8181
if: repo =~ /^rust-lang\/rust-clippy$/
8282
allow_failures:
8383
- os: windows
84-
env: BASE_TESTS=true
84+
env: CARGO_INCREMENTAL=0 BASE_TESTS=true
8585
# prevent these jobs with default env vars
8686
exclude:
8787
- os: linux

ci/base-tests.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ cd clippy_dev && cargo test && cd ..
2828
./util/dev update_lints --check
2929
cargo +nightly fmt --all -- --check
3030

31+
# Add bin to PATH for windows
32+
PATH=$PATH:$(rustc --print sysroot)/bin
33+
3134
CLIPPY="`pwd`/target/debug/cargo-clippy clippy"
3235
# run clippy on its own codebase...
3336
${CLIPPY} --all-targets --all-features -- -D clippy::all -D clippy::internal -Dclippy::pedantic

0 commit comments

Comments
 (0)