Skip to content

Commit

Permalink
Merge pull request rust-lang#770 from mattico/improve-travis
Browse files Browse the repository at this point in the history
Improve CI
  • Loading branch information
mattico authored Aug 22, 2018
2 parents 3688f73 + 9157f6e commit 5baaf55
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 58 deletions.
19 changes: 11 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
language: rust

rust:
- stable
- beta
- nightly

os:
- linux
- osx

cache:
timeout: 360
cargo: true
Expand All @@ -10,16 +19,10 @@ before_cache:
env:
global:
- CRATE_NAME=mdbook
- TARGET=x86_64-unknown-linux-gnu

install:
- sh ci/install.sh
- export PATH=$PATH:$HOME/.cargo/bin

script:
- cargo build --all --no-default-features
- cargo build --verbose
- cargo test --verbose
- cargo test --all
- cargo test --all --no-default-features

before_deploy:
- sh ci/before_deploy.sh
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ build: false

# Equivalent to Travis' `script` phase
test_script:
- cargo build --verbose
- cargo test --verbose
- cargo test --all
- cargo test --all --no-default-features

before_deploy:
# Generate artifacts for release
- cargo build --release
- cargo rustc --bin mdbook --release -- -C lto
- mkdir staging
- copy target\release\mdbook.exe staging
- cd staging
Expand Down
47 changes: 0 additions & 47 deletions ci/install.sh

This file was deleted.

0 comments on commit 5baaf55

Please sign in to comment.