itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Workaround by using yesterday's nightly"

Browse Source 
This reverts commit 5576372d3833f72ff4db865ece7b8acdbade2911.
This commit is contained in:
Dale Wijnand 2019-01-11 10:36:40 +00:00
parent c9fa7db4d4
commit dc32c6015e
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -30,15 +30,15 @@ matrix:
ALT=i686-unknown-linux-gnu
rust: 1.31.0
script:
- rustup toolchain install nightly-2019-01-09 || travis_terminate 1
- cargo +nightly-2019-01-09 generate-lockfile -Z minimal-versions || travis_terminate 1
- rustup toolchain install nightly || travis_terminate 1
- cargo +nightly generate-lockfile -Z minimal-versions || travis_terminate 1
- cargo -V || travis_terminate 1
- cargo test --features=deny-warnings || travis_terminate 1
if: branch != master OR type = pull_request
- env: TARGET=x86_64-unknown-linux-gnu
ALT=i686-unknown-linux-gnu
rust: nightly-2019-01-09
rust: nightly
install:
- travis_retry curl -Lf https://github.com/rust-lang-nursery/mdBook/releases/download/v0.1.7/mdbook-v0.1.7-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=$HOME/.cargo/bin
script:

4
appveyor.yml
View File

@ -9,7 +9,7 @@ environment:
install:
- if NOT defined APPVEYOR_PULL_REQUEST_NUMBER if "%APPVEYOR_REPO_BRANCH%" == "master" appveyor exit
- appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
- rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain nightly-2019-01-09
- rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain nightly
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
- if defined MINIMAL_VERSIONS rustup toolchain install 1.31.0
- if defined OTHER_TARGET rustup target add %OTHER_TARGET%
@ -25,5 +25,5 @@ test_script:
# we don't have ci time to run the full `cargo test` with `minimal-versions` like
# - if defined MINIMAL_VERSIONS cargo +nightly generate-lockfile -Z minimal-versions && cargo +stable test
# so we just run `cargo check --tests` like
- if defined MINIMAL_VERSIONS cargo +nightly-2019-01-09 generate-lockfile -Z minimal-versions && cargo +1.31.0 check --tests --features=deny-warnings
- if defined MINIMAL_VERSIONS cargo +nightly generate-lockfile -Z minimal-versions && cargo +1.31.0 check --tests --features=deny-warnings
- if NOT defined MINIMAL_VERSIONS cargo test --features=deny-warnings