Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Commit 2b96054

Browse files
authored
Merge pull request #123 from JohnTitor/rtim
Tweak CI
2 parents eb61d77 + 411cbcc commit 2b96054

File tree

5 files changed

+27
-15
lines changed

5 files changed

+27
-15
lines changed

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ language: rust
22
rust: nightly
33
sudo: false
44

5+
cache: cargo
6+
57
notifications:
68
email:
79
on_failure: always

ci/run.sh

+13-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@ set -ex
55
export RUST_BACKTRACE=full
66
#export RUST_TEST_NOCAPTURE=1
77

8-
rustup component add rustc-dev
8+
cargo +nightly install rustup-toolchain-install-master
9+
if [ "${TRAVIS_OS_NAME}" = "windows" ]; then
10+
rustup-toolchain-install-master -f -n master -c rustc-dev -i x86_64-pc-windows-msvc
11+
else
12+
rustup-toolchain-install-master -f -n master -c rustc-dev
13+
fi
14+
rustup override set master
915

1016
cargo build
1117
cargo test --verbose -- --nocapture
@@ -20,14 +26,18 @@ case "${TRAVIS_OS_NAME}" in
2026
TEST_TARGET=x86_64-unknown-linux-gnu cargo test --verbose -- --nocapture
2127
;;
2228
*"windows"*)
23-
rustup target add x86_64-pc-windows-msvc
2429
TEST_TARGET=x86_64-pc-windows-msvc cargo test --verbose -- --nocapture
2530
;;
2631
*"macos"*)
2732
TEST_TARGET=x86_64-apple-darwin cargo test --verbose -- --nocapture
2833
;;
2934
esac
3035

36+
# FIXME: Somehow we couldn't install semverver on Travis' Windows builder.
37+
if [ "${TRAVIS_OS_NAME}" = "windows" ]; then
38+
exit 0
39+
fi
40+
3141
# install
3242
mkdir -p ~/rust/cargo/bin
3343
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
5464
exit 1
5565
fi
5666
else
57-
echo 'Failed to check semver-compliance of semverver. Failed to compiled previous version.' >&2
67+
echo 'Failed to check semver-compliance of semverver. Failed to compiled previous version.' >&2
5868
fi

tests/full_cases/log-0.3.4-0.3.8.osx

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ warning: technically breaking changes in `<new::LogRecord<'a> as std::fmt::Debug
2323
|
2424
= note: trait impl generalized or newly added (technically breaking)
2525

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

74-
warning: technically breaking changes in `<new::LogLocation as std::marker::StructuralEq>`
74+
warning: technically breaking changes in `<new::LogLocation as std::cmp::Eq>`
7575
--> log-0.3.8/src/lib.rs:604:30
7676
|
7777
604 | #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]

tests/full_cases/log-0.3.4-0.3.8.windows_msvc

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ warning: technically breaking changes in `<new::LogRecord<'a> as std::fmt::Debug
2323
|
2424
= note: trait impl generalized or newly added (technically breaking)
2525

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

74-
warning: technically breaking changes in `<new::LogLocation as std::cmp::Eq>`
74+
warning: technically breaking changes in `<new::LogLocation as std::marker::StructuralEq>`
7575
--> log-0.3.8\src\lib.rs:604:30
7676
|
7777
604 | #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]

tests/full_cases/rmpv-0.4.0-0.4.1.windows_msvc

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version bump: 0.4.0 -> (breaking) -> 0.4.1
22
error: breaking changes in `<old::decode::Error as std::convert::From<rmp::decode::MarkerReadError>>`
3-
--> rmpv-0.4.0/src/decode/mod.rs:60:1
3+
--> rmpv-0.4.0\src\decode\mod.rs:60:1
44
|
55
60 | / impl From<MarkerReadError> for Error {
66
61 | | fn from(err: MarkerReadError) -> Error {
@@ -12,7 +12,7 @@ error: breaking changes in `<old::decode::Error as std::convert::From<rmp::decod
1212
= warning: trait impl specialized or removed (breaking)
1313

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

2828
error: breaking changes in `write_value`
29-
--> rmpv-0.4.1/src/encode/value.rs:15:1
29+
--> rmpv-0.4.1\src\encode\value.rs:15:1
3030
|
3131
15 | / pub fn write_value<W>(wr: &mut W, val: &Value) -> Result<(), Error>
3232
16 | | where W: Write
@@ -40,7 +40,7 @@ error: breaking changes in `write_value`
4040
= warning: type error: expected enum `old::encode::Error`, found enum `new::encode::Error` (breaking)
4141

4242
error: breaking changes in `write_value_ref`
43-
--> rmpv-0.4.1/src/encode/value_ref.rs:27:1
43+
--> rmpv-0.4.1\src\encode\value_ref.rs:27:1
4444
|
4545
27 | / pub fn write_value_ref<W>(wr: &mut W, val: &ValueRef) -> Result<(), Error>
4646
28 | | where W: Write
@@ -54,7 +54,7 @@ error: breaking changes in `write_value_ref`
5454
= warning: type error: expected enum `old::encode::Error`, found enum `new::encode::Error` (breaking)
5555

5656
warning: technically breaking changes in `as_ref`
57-
--> rmpv-0.4.1/src/lib.rs:253:5
57+
--> rmpv-0.4.1\src\lib.rs:253:5
5858
|
5959
253 | / pub fn as_ref(&self) -> Utf8StringRef {
6060
254 | | match self.s {
@@ -67,7 +67,7 @@ warning: technically breaking changes in `as_ref`
6767
= note: added item in inherent impl (technically breaking)
6868

6969
warning: technically breaking changes in `as_ref`
70-
--> rmpv-0.4.1/src/lib.rs:448:5
70+
--> rmpv-0.4.1\src\lib.rs:448:5
7171
|
7272
448 | / pub fn as_ref(&self) -> ValueRef {
7373
449 | | match self {
@@ -81,7 +81,7 @@ warning: technically breaking changes in `as_ref`
8181
= note: added item in inherent impl (technically breaking)
8282

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

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

0 commit comments

Comments
 (0)