Skip to content
This repository was archived by the owner on Dec 10, 2022. It is now read-only.

Commit 36b13b5

Browse files
committed
chore(travis): synchronize travis config with tox core
1 parent 09287aa commit 36b13b5

File tree

3 files changed

+19
-47
lines changed

3 files changed

+19
-47
lines changed

.travis.yml

Lines changed: 19 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,14 @@
11
language: rust
2+
os:
3+
- linux
4+
- osx
25
rust:
36
- 1.31.0
47
- stable
58
- beta
69
- nightly
7-
cache:
8-
- apt
9-
- cargo
10-
11-
os:
12-
- linux
13-
- osx
14-
15-
matrix:
16-
allow_failures:
17-
- rust: beta
18-
- rust: nightly
19-
20-
sudo: required
2110

11+
sudo: false
2212
env:
2313
global:
2414
- RUST_BACKTRACE=1
@@ -31,27 +21,23 @@ before_install:
3121
- |
3222
if [[ "$TRAVIS_OS_NAME" == "linux" ]]
3323
then
34-
./scripts/verify-commit-messages.sh "$TRAVIS_COMMIT_RANGE" \
35-
&& ./scripts/bootstrap-ubuntu-14-04.sh
36-
fi
37-
- |
38-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]
39-
then
40-
./scripts/bootstrap-osx.sh
41-
fi
42-
43-
install:
44-
- |
45-
if [[ "$TRAVIS_RUST_VERSION" == nightly ]]
46-
then
47-
rustup component add clippy-preview
24+
./scripts/verify-commit-messages.sh "$TRAVIS_COMMIT_RANGE" || exit 1;
4825
fi
4926
5027
script:
5128
- cargo build --verbose
5229
- cargo test --verbose
53-
- |
54-
if [[ "$TRAVIS_RUST_VERSION" == nightly ]]
55-
then
56-
cargo clippy --verbose --all --tests
57-
fi
30+
31+
matrix:
32+
allow_failures:
33+
- rust: beta
34+
- rust: nightly
35+
include:
36+
- os: linux
37+
rust: stable
38+
env:
39+
NAME: clippy
40+
install:
41+
- rustup component add clippy
42+
script:
43+
- cargo clippy --verbose --all --tests

scripts/bootstrap-osx.sh

Lines changed: 0 additions & 6 deletions
This file was deleted.

scripts/bootstrap-ubuntu-14-04.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)