Auto merge of #103 - alexcrichton:update-ci, r=japaric

Update CI configs

* Run on the master branch (to get previews)
* Pass --target on AppVeyor (oops)
* Use the current nightly for arm (I think that bug is fixed)
This commit is contained in:
bors 2016-10-14 17:56:26 -07:00 committed by GitHub
commit 0b53393c08
2 changed files with 4 additions and 16 deletions

View File

@ -9,8 +9,6 @@ matrix:
include: include:
- env: TARGET=aarch64-unknown-linux-gnu - env: TARGET=aarch64-unknown-linux-gnu
- env: TARGET=arm-unknown-linux-gnueabi - env: TARGET=arm-unknown-linux-gnueabi
# FIXME(rust-lang/rust#36518)
rust: nightly-2016-09-21
- env: TARGET=arm-unknown-linux-gnueabihf - env: TARGET=arm-unknown-linux-gnueabihf
- env: TARGET=armv7-unknown-linux-gnueabihf - env: TARGET=armv7-unknown-linux-gnueabihf
- env: TARGET=i586-unknown-linux-gnu - env: TARGET=i586-unknown-linux-gnu
@ -51,11 +49,6 @@ script:
# Travis can't cache files that are not readable by "others" # Travis can't cache files that are not readable by "others"
- chmod -R a+r $HOME/.cargo - chmod -R a+r $HOME/.cargo
branches:
only:
- auto
- try
notifications: notifications:
email: email:
on_success: never on_success: never

View File

@ -14,12 +14,7 @@ install:
build: false build: false
test_script: test_script:
- cargo build - cargo build --target %TARGET%
- cargo build --release - cargo build --release --target %TARGET%
- cargo test - cargo test --target %TARGET%
- cargo test --release - cargo test --release --target %TARGET%
branches:
only:
- auto
- try