Skip to content

Commit 0b53393

Browse files
authored
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)
2 parents 8c3e0ae + 9b6f5ff commit 0b53393

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

.travis.yml

-7
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ matrix:
99
include:
1010
- env: TARGET=aarch64-unknown-linux-gnu
1111
- env: TARGET=arm-unknown-linux-gnueabi
12-
# FIXME(rust-lang/rust#36518)
13-
rust: nightly-2016-09-21
1412
- env: TARGET=arm-unknown-linux-gnueabihf
1513
- env: TARGET=armv7-unknown-linux-gnueabihf
1614
- env: TARGET=i586-unknown-linux-gnu
@@ -51,11 +49,6 @@ script:
5149
# Travis can't cache files that are not readable by "others"
5250
- chmod -R a+r $HOME/.cargo
5351

54-
branches:
55-
only:
56-
- auto
57-
- try
58-
5952
notifications:
6053
email:
6154
on_success: never

appveyor.yml

+4-9
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,7 @@ install:
1414
build: false
1515

1616
test_script:
17-
- cargo build
18-
- cargo build --release
19-
- cargo test
20-
- cargo test --release
21-
22-
branches:
23-
only:
24-
- auto
25-
- try
17+
- cargo build --target %TARGET%
18+
- cargo build --release --target %TARGET%
19+
- cargo test --target %TARGET%
20+
- cargo test --release --target %TARGET%

0 commit comments

Comments
 (0)