• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

rayonパッケージ


Commit MetaInfo

Revisióned77cd8be5610c76e4ca8d21b6f28792a36d17aa (tree)
Tiempo2018-03-28 10:15:11
AutorJosh Stone <cuviper@gmai...>
CommiterJosh Stone

Log Message

Try another approach to hacking rand in CI

Using sed to hack rand-0.3.20 in Cargo.lock worked for a while, but
now it's giving us an invalid lockfile, because some of the test/demo
dependencies need rand-0.4 themselves.

Instead, we now just tweak rayon-core/Cargo.toml long enough to
generate a complete lock file, which is enough to get a working CI build
on Rust 1.13 again.

Cambiar Resumen

Diferencia incremental

--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,10 @@ matrix:
1717 #if: everything!
1818 before_script:
1919 # rand 0.4.2 requires rust 1.15, and rand-0.3.22 requires rand-0.4 :/
20- # manually hacking the lockfile due to the limitations of cargo#2773
20+ # manually lowering the dependency in rayon-core:
21+ - sed -i -e 's/^rand = .*$/rand = "=0.3.20"/' rayon-core/Cargo.toml
2122 - cargo generate-lockfile
22- - sed -i -e 's/"rand 0.[34].[0-9]\+/"rand 0.3.20/' Cargo.lock
23- - sed -i -e '/^name = "rand"/,/^$/s/version = "0.3.[0-9]\+"/version = "0.3.20"/' Cargo.lock
23+ - git checkout rayon-core/Cargo.toml
2424
2525 - rust: stable
2626 os: linux