diff --git a/.travis.yml b/.travis.yml index 5807ad3f66ca4..18aa1f9d7b9e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: rust rust: nightly sudo: false +cache: cargo + notifications: email: on_failure: always diff --git a/ci/run.sh b/ci/run.sh index 4d995b1fca0ac..4443668f551fe 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -5,7 +5,13 @@ set -ex export RUST_BACKTRACE=full #export RUST_TEST_NOCAPTURE=1 -rustup component add rustc-dev +cargo +nightly install rustup-toolchain-install-master +if [ "${TRAVIS_OS_NAME}" = "windows" ]; then + rustup-toolchain-install-master -f -n master -c rustc-dev -i x86_64-pc-windows-msvc +else + rustup-toolchain-install-master -f -n master -c rustc-dev +fi +rustup override set master cargo build cargo test --verbose -- --nocapture @@ -20,7 +26,6 @@ case "${TRAVIS_OS_NAME}" in TEST_TARGET=x86_64-unknown-linux-gnu cargo test --verbose -- --nocapture ;; *"windows"*) - rustup target add x86_64-pc-windows-msvc TEST_TARGET=x86_64-pc-windows-msvc cargo test --verbose -- --nocapture ;; *"macos"*) @@ -28,6 +33,11 @@ case "${TRAVIS_OS_NAME}" in ;; esac +# FIXME: Somehow we couldn't install semverver on Travis' Windows builder. +if [ "${TRAVIS_OS_NAME}" = "windows" ]; then + exit 0 +fi + # install mkdir -p ~/rust/cargo/bin cp target/debug/cargo-semver ~/rust/cargo/bin @@ -54,5 +64,5 @@ if cargo install --root "$(mktemp -d)" semverver > /dev/null 2>/dev/null; then exit 1 fi else - echo 'Failed to check semver-compliance of semverver. Failed to compiled previous version.' >&2 + echo 'Failed to check semver-compliance of semverver. Failed to compiled previous version.' >&2 fi diff --git a/tests/full_cases/log-0.3.4-0.3.8.osx b/tests/full_cases/log-0.3.4-0.3.8.osx index e77b51cc8b98d..6f0122e2e37c7 100644 --- a/tests/full_cases/log-0.3.4-0.3.8.osx +++ b/tests/full_cases/log-0.3.4-0.3.8.osx @@ -23,7 +23,7 @@ warning: technically breaking changes in ` as std::fmt::Debug | = note: trait impl generalized or newly added (technically breaking) -warning: technically breaking changes in ` as std::marker::StructuralEq>` +warning: technically breaking changes in ` as std::cmp::Eq>` --> log-0.3.8/src/lib.rs:552:10 | 552 | #[derive(Eq, PartialEq, Ord, PartialOrd, Hash, Debug)] @@ -71,7 +71,7 @@ warning: technically breaking changes in ` as std::fmt::Deb | = note: trait impl generalized or newly added (technically breaking) -warning: technically breaking changes in `` +warning: technically breaking changes in `` --> log-0.3.8/src/lib.rs:604:30 | 604 | #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)] diff --git a/tests/full_cases/log-0.3.4-0.3.8.windows_msvc b/tests/full_cases/log-0.3.4-0.3.8.windows_msvc index 68ef6b55d481d..ecd8f1c4bf6e7 100644 --- a/tests/full_cases/log-0.3.4-0.3.8.windows_msvc +++ b/tests/full_cases/log-0.3.4-0.3.8.windows_msvc @@ -23,7 +23,7 @@ warning: technically breaking changes in ` as std::fmt::Debug | = note: trait impl generalized or newly added (technically breaking) -warning: technically breaking changes in ` as std::cmp::Eq>` +warning: technically breaking changes in ` as std::marker::StructuralEq>` --> log-0.3.8\src\lib.rs:552:10 | 552 | #[derive(Eq, PartialEq, Ord, PartialOrd, Hash, Debug)] @@ -71,7 +71,7 @@ warning: technically breaking changes in ` as std::fmt::Deb | = note: trait impl generalized or newly added (technically breaking) -warning: technically breaking changes in `` +warning: technically breaking changes in `` --> log-0.3.8\src\lib.rs:604:30 | 604 | #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)] diff --git a/tests/full_cases/rmpv-0.4.0-0.4.1.windows_msvc b/tests/full_cases/rmpv-0.4.0-0.4.1.windows_msvc index 92383e1215909..6164e8b4e0e4e 100644 --- a/tests/full_cases/rmpv-0.4.0-0.4.1.windows_msvc +++ b/tests/full_cases/rmpv-0.4.0-0.4.1.windows_msvc @@ -1,6 +1,6 @@ version bump: 0.4.0 -> (breaking) -> 0.4.1 error: breaking changes in `>` - --> rmpv-0.4.0/src/decode/mod.rs:60:1 + --> rmpv-0.4.0\src\decode\mod.rs:60:1 | 60 | / impl From for Error { 61 | | fn from(err: MarkerReadError) -> Error { @@ -12,7 +12,7 @@ error: breaking changes in `>` - --> rmpv-0.4.0/src/decode/mod.rs:66:1 + --> rmpv-0.4.0\src\decode\mod.rs:66:1 | 66 | / impl From for Error { 67 | | fn from(err: ValueReadError) -> Error { @@ -26,7 +26,7 @@ error: breaking changes in ` rmpv-0.4.1/src/encode/value.rs:15:1 + --> rmpv-0.4.1\src\encode\value.rs:15:1 | 15 | / pub fn write_value(wr: &mut W, val: &Value) -> Result<(), Error> 16 | | where W: Write @@ -40,7 +40,7 @@ error: breaking changes in `write_value` = warning: type error: expected enum `old::encode::Error`, found enum `new::encode::Error` (breaking) error: breaking changes in `write_value_ref` - --> rmpv-0.4.1/src/encode/value_ref.rs:27:1 + --> rmpv-0.4.1\src\encode\value_ref.rs:27:1 | 27 | / pub fn write_value_ref(wr: &mut W, val: &ValueRef) -> Result<(), Error> 28 | | where W: Write @@ -54,7 +54,7 @@ error: breaking changes in `write_value_ref` = warning: type error: expected enum `old::encode::Error`, found enum `new::encode::Error` (breaking) warning: technically breaking changes in `as_ref` - --> rmpv-0.4.1/src/lib.rs:253:5 + --> rmpv-0.4.1\src\lib.rs:253:5 | 253 | / pub fn as_ref(&self) -> Utf8StringRef { 254 | | match self.s { @@ -67,7 +67,7 @@ warning: technically breaking changes in `as_ref` = note: added item in inherent impl (technically breaking) warning: technically breaking changes in `as_ref` - --> rmpv-0.4.1/src/lib.rs:448:5 + --> rmpv-0.4.1\src\lib.rs:448:5 | 448 | / pub fn as_ref(&self) -> ValueRef { 449 | | match self { @@ -81,7 +81,7 @@ warning: technically breaking changes in `as_ref` = note: added item in inherent impl (technically breaking) warning: technically breaking changes in `>` - --> rmpv-0.4.1/src/decode/mod.rs:60:1 + --> rmpv-0.4.1\src\decode\mod.rs:60:1 | 60 | / impl From for Error { 61 | | fn from(err: MarkerReadError) -> Error { @@ -93,7 +93,7 @@ warning: technically breaking changes in `>` - --> rmpv-0.4.1/src/decode/mod.rs:66:1 + --> rmpv-0.4.1\src\decode\mod.rs:66:1 | 66 | / impl From for Error { 67 | | fn from(err: ValueReadError) -> Error {