From 9068a2a4b36ac7f008c52b8f6d5b874ec8a37739 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Wed, 9 May 2018 15:13:36 +0200 Subject: [PATCH] cargo cache was messing up xargo/miri install --- .travis.yml | 4 ++-- appveyor.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b6bd15b1eb..360b741106e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ before_script: - rustup target add i686-pc-windows-gnu - rustup target add i686-pc-windows-msvc - rustup component add rust-src -- cargo install --git https://github.com/japaric/xargo.git +- cargo install xargo || echo "skipping xargo install" - export RUST_SYSROOT=$HOME/rust script: - set -e @@ -19,7 +19,7 @@ script: # Test plain miri cargo build --release --all-features && cargo test --release --all-features --all && - cargo install --all-features + cargo install --all-features --force - | # Test cargo miri cd cargo-miri-test && diff --git a/appveyor.yml b/appveyor.yml index 40ecd9492c1..46580f274bf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,7 +22,7 @@ install: - rustc -V - cargo -V - rustup component add rust-src - - cargo install --git https://github.com/japaric/xargo.git + - cargo install xargo - cd xargo - set RUSTFLAGS=-Zalways-encode-mir -Zmir-emit-validate=1 - xargo build