diff --git a/.travis.yml b/.travis.yml index d71fb7a40c5..48b0923f33e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ matrix: include: - env: TARGET=x86_64-unknown-linux-gnu ALT=i686-unknown-linux-gnu - if: branch != master OR type = pull_request + - env: TARGET=x86_64-apple-darwin ALT=i686-apple-darwin os: osx @@ -30,21 +30,21 @@ matrix: ALT=i686-unknown-linux-gnu rust: 1.31.0 script: - - rustup toolchain install nightly - - cargo +nightly generate-lockfile -Z minimal-versions - - cargo -V - - cargo test --features=deny-warnings + - rustup toolchain install nightly-2019-01-09 || travis_terminate 1 + - cargo +nightly-2019-01-09 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 + rust: nightly-2019-01-09 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: - - cargo test --features=deny-warnings - - cargo doc --no-deps - - (cd src/doc && mdbook build --dest-dir ../../target/doc) + - cargo test --features=deny-warnings || travis_terminate 1 + - cargo doc --no-deps || travis_terminate 1 + - (cd src/doc && mdbook build --dest-dir ../../target/doc) || travis_terminate 1 if: branch != master OR type = pull_request exclude: diff --git a/README.md b/README.md index 6234215f5e3..d38aefa23f9 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Learn more at https://doc.rust-lang.org/cargo/ ## Code Status -[![Build Status](https://travis-ci.org/rust-lang/cargo.svg?branch=master)](https://travis-ci.org/rust-lang/cargo) +[![Build Status](https://travis-ci.com/rust-lang/cargo.svg?branch=master)](https://travis-ci.com/rust-lang/cargo) [![Build Status](https://ci.appveyor.com/api/projects/status/github/rust-lang/cargo?branch=master&svg=true)](https://ci.appveyor.com/project/rust-lang-libs/cargo) Code documentation: https://docs.rs/cargo/ diff --git a/appveyor.yml b/appveyor.yml index e05d4791672..55ca3ea57d8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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 + - rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain nightly-2019-01-09 - 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 generate-lockfile -Z minimal-versions && cargo +1.31.0 check --tests --features=deny-warnings + - if defined MINIMAL_VERSIONS cargo +nightly-2019-01-09 generate-lockfile -Z minimal-versions && cargo +1.31.0 check --tests --features=deny-warnings - if NOT defined MINIMAL_VERSIONS cargo test --features=deny-warnings