]> git.lizzy.rs Git - rust.git/commitdiff
cargo cache was messing up xargo/miri install
authorOliver Schneider <git-no-reply-9879165716479413131@oli-obk.de>
Wed, 9 May 2018 13:13:36 +0000 (15:13 +0200)
committerOliver Schneider <git-no-reply-9879165716479413131@oli-obk.de>
Wed, 9 May 2018 13:14:16 +0000 (15:14 +0200)
.travis.yml
appveyor.yml

index 9b6bd15b1eb9d931d905d29b2568dbb2d43ac894..360b741106e58284080e5d737f4b3d2fdd20be0f 100644 (file)
@@ -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 &&
index 40ecd9492c1a536489376bb152ea0c98867ba8c3..46580f274bf62b01bc04cbcf5f45675ffa6143ea 100644 (file)
@@ -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