Skip to content

Commit 60bef04

Browse files
bors[bot]phimuemue
andauthored
Merge #445
445: Try temporary fix for CI r=jswrenn a=phimuemue Unfortunately, I was not able to implement the idea @jswrenn suggested in #444 (comment) (having an optional `dev-dependency` seems to be a problem). Thus, I adapted @jswrenn's attempt from 3f9e669 so that our MSRV only `build`s while stable/beta/nightly also test and bench. To be honest, this feels pretty unsastisfactorily, but it may for now be a viable option that avoids blocking all PRs just because of a compilation error in a `dev-dependency`. Another possibility might be to downgrade `criterion`'s version (or abandon `criterion` altogether), both not particularly appealing imho. When releasing a new version, we could still try to have one test/bench run on our MSVC (possibly with a manually adjusted `criterion` version). (Sorry for all the noise from my side, but I'd really like to settle these kinds of problems so that we enable people to contribute without much inconvenience.) Co-authored-by: philipp <[email protected]>
2 parents 4673086 + 4511a8d commit 60bef04

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

.travis.yml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,35 @@ sudo: false
33
matrix:
44
include:
55
- rust: 1.32.0
6+
script:
7+
- |
8+
cargo build --verbose --no-default-features &&
9+
cargo build --verbose --features "$FEATURES"
610
- rust: stable
11+
script:
12+
- |
13+
cargo build --verbose --no-default-features &&
14+
cargo build --verbose --features "$FEATURES" &&
15+
cargo test --verbose --features "$FEATURES" &&
16+
cargo bench --no-run --verbose --features "$FEATURES"
717
- rust: beta
18+
script:
19+
- |
20+
cargo build --verbose --no-default-features &&
21+
cargo build --verbose --features "$FEATURES" &&
22+
cargo test --verbose --features "$FEATURES" &&
23+
cargo bench --no-run --verbose --features "$FEATURES"
824
- rust: nightly
25+
script:
26+
- |
27+
cargo build --verbose --no-default-features &&
28+
cargo build --verbose --features "$FEATURES" &&
29+
cargo test --verbose --features "$FEATURES" &&
30+
cargo bench --no-run --verbose --features "$FEATURES"
931
cache: cargo # https://docs.travis-ci.com/user/languages/rust/#dependency-management
1032
branches:
1133
only:
1234
- master
1335
# bors branches
1436
- staging
1537
- trying
16-
script:
17-
- |
18-
cargo build --verbose --no-default-features &&
19-
cargo build --verbose --features "$FEATURES" &&
20-
cargo test --verbose --features "$FEATURES" &&
21-
cargo bench --no-run --verbose --features "$FEATURES"

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ either = { version = "1.0", default-features = false }
2727

2828
[dev-dependencies]
2929
rand = "0.7"
30-
criterion = "=0.3.0" # TODO update criterion version once it becomes compatible with our minimum required Rust verision or bump minimum required rust version
30+
criterion = "=0" # TODO how could this work with our minimum supported rust version?
3131

3232
[dev-dependencies.quickcheck]
3333
version = "0.9"

0 commit comments

Comments
 (0)