Merge #705

705: Update compat-Cargo.lock r=cuviper a=matklad I've noticed that #704 uses old compat lockfile, which is strange, given that it changes Cargo.lock. What happens here is that cargo writes new compat lockfile during CI. That means that CI might break randomly, if rayon's dependency is published with the same major version, but different MSRV With this PR, CI will break deterministically if you change Cargo.toml and don't update compat-Cargo.lock. Not sure if this actually makes sense :) Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
rayon-rs · Nov 7, 2019 · 73b1061 · 73b1061
2 parents 65fda30 + 54c0b0d
commit 73b1061
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ matrix:
       os: linux
       #if: everything!
       before_script: cp ci/compat-Cargo.lock ./Cargo.lock
-      script: cargo build
+      script: cargo build --locked
 
     - rust: stable
       os: linux

diff --git a/ci/compat-Cargo.lock b/ci/compat-Cargo.lock