Skip to content

Commit

Permalink
Merge pull request rust-lang#123 from JohnTitor/rtim
Browse files Browse the repository at this point in the history
Tweak CI
  • Loading branch information
Manishearth committed May 21, 2020
2 parents eb61d77 + 411cbcc commit 2b96054
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 15 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ language: rust
rust: nightly
sudo: false

cache: cargo

notifications:
email:
on_failure: always
Expand Down
16 changes: 13 additions & 3 deletions ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -20,14 +26,18 @@ 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"*)
TEST_TARGET=x86_64-apple-darwin cargo test --verbose -- --nocapture
;;
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
Expand All @@ -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
4 changes: 2 additions & 2 deletions tests/full_cases/log-0.3.4-0.3.8.osx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ warning: technically breaking changes in `<new::LogRecord<'a> as std::fmt::Debug
|
= note: trait impl generalized or newly added (technically breaking)

warning: technically breaking changes in `<new::LogMetadata<'a> as std::marker::StructuralEq>`
warning: technically breaking changes in `<new::LogMetadata<'a> as std::cmp::Eq>`
--> log-0.3.8/src/lib.rs:552:10
|
552 | #[derive(Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
Expand Down Expand Up @@ -71,7 +71,7 @@ warning: technically breaking changes in `<new::LogMetadata<'a> as std::fmt::Deb
|
= note: trait impl generalized or newly added (technically breaking)

warning: technically breaking changes in `<new::LogLocation as std::marker::StructuralEq>`
warning: technically breaking changes in `<new::LogLocation as std::cmp::Eq>`
--> log-0.3.8/src/lib.rs:604:30
|
604 | #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
Expand Down
4 changes: 2 additions & 2 deletions tests/full_cases/log-0.3.4-0.3.8.windows_msvc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ warning: technically breaking changes in `<new::LogRecord<'a> as std::fmt::Debug
|
= note: trait impl generalized or newly added (technically breaking)

warning: technically breaking changes in `<new::LogMetadata<'a> as std::cmp::Eq>`
warning: technically breaking changes in `<new::LogMetadata<'a> as std::marker::StructuralEq>`
--> log-0.3.8\src\lib.rs:552:10
|
552 | #[derive(Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
Expand Down Expand Up @@ -71,7 +71,7 @@ warning: technically breaking changes in `<new::LogMetadata<'a> as std::fmt::Deb
|
= note: trait impl generalized or newly added (technically breaking)

warning: technically breaking changes in `<new::LogLocation as std::cmp::Eq>`
warning: technically breaking changes in `<new::LogLocation as std::marker::StructuralEq>`
--> log-0.3.8\src\lib.rs:604:30
|
604 | #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
Expand Down
16 changes: 8 additions & 8 deletions tests/full_cases/rmpv-0.4.0-0.4.1.windows_msvc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version bump: 0.4.0 -> (breaking) -> 0.4.1
error: breaking changes in `<old::decode::Error as std::convert::From<rmp::decode::MarkerReadError>>`
--> rmpv-0.4.0/src/decode/mod.rs:60:1
--> rmpv-0.4.0\src\decode\mod.rs:60:1
|
60 | / impl From<MarkerReadError> for Error {
61 | | fn from(err: MarkerReadError) -> Error {
Expand All @@ -12,7 +12,7 @@ error: breaking changes in `<old::decode::Error as std::convert::From<rmp::decod
= warning: trait impl specialized or removed (breaking)

error: breaking changes in `<old::decode::Error as std::convert::From<rmp::decode::ValueReadError>>`
--> rmpv-0.4.0/src/decode/mod.rs:66:1
--> rmpv-0.4.0\src\decode\mod.rs:66:1
|
66 | / impl From<ValueReadError> for Error {
67 | | fn from(err: ValueReadError) -> Error {
Expand All @@ -26,7 +26,7 @@ error: breaking changes in `<old::decode::Error as std::convert::From<rmp::decod
= warning: trait impl specialized or removed (breaking)

error: breaking changes in `write_value`
--> 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<W>(wr: &mut W, val: &Value) -> Result<(), Error>
16 | | where W: Write
Expand All @@ -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<W>(wr: &mut W, val: &ValueRef) -> Result<(), Error>
28 | | where W: Write
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -81,7 +81,7 @@ warning: technically breaking changes in `as_ref`
= note: added item in inherent impl (technically breaking)

warning: technically breaking changes in `<new::decode::Error as std::convert::From<rmp::decode::MarkerReadError>>`
--> rmpv-0.4.1/src/decode/mod.rs:60:1
--> rmpv-0.4.1\src\decode\mod.rs:60:1
|
60 | / impl From<MarkerReadError> for Error {
61 | | fn from(err: MarkerReadError) -> Error {
Expand All @@ -93,7 +93,7 @@ warning: technically breaking changes in `<new::decode::Error as std::convert::F
= note: trait impl generalized or newly added (technically breaking)

warning: technically breaking changes in `<new::decode::Error as std::convert::From<rmp::decode::ValueReadError>>`
--> rmpv-0.4.1/src/decode/mod.rs:66:1
--> rmpv-0.4.1\src\decode\mod.rs:66:1
|
66 | / impl From<ValueReadError> for Error {
67 | | fn from(err: ValueReadError) -> Error {
Expand Down

0 comments on commit 2b96054

Please sign in to comment.