Skip to content

Commit e03a06b

Browse files
authored
Merge pull request #3300 from phansch/travis_windows
Add Travis windows build
2 parents 9d33731 + f5a38f2 commit e03a06b

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

.travis.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ rust: nightly
55
os:
66
- linux
77
- osx
8+
- windows
89

910
sudo: false
1011

@@ -23,7 +24,7 @@ before_install:
2324
2425
install:
2526
- |
26-
if [ -z ${INTEGRATION} ]; then
27+
if [ -z ${INTEGRATION} ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then
2728
. $HOME/.nvm/nvm.sh
2829
nvm install stable
2930
nvm use stable
@@ -36,6 +37,8 @@ matrix:
3637
env: BASE_TESTS=true
3738
- os: linux
3839
env: BASE_TESTS=true
40+
- os: windows
41+
env: BASE_TEST=true
3942
- env: INTEGRATION=rust-lang/cargo
4043
- env: INTEGRATION=rust-lang-nursery/rand
4144
- env: INTEGRATION=rust-lang-nursery/stdsimd
@@ -49,10 +52,14 @@ matrix:
4952
- env: INTEGRATION=serde-rs/serde
5053
- env: INTEGRATION=Geal/nom
5154
- env: INTEGRATION=hyperium/hyper
55+
allow_failures:
56+
- os: windows
57+
env: BASE_TEST=true
5258
# prevent these jobs with default env vars
5359
exclude:
5460
- os: linux
5561
- os: osx
62+
- os: windows
5663

5764
script:
5865
- |

ci/base-tests.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ set -ex
1414
echo "Running clippy base tests"
1515

1616
PATH=$PATH:./node_modules/.bin
17-
remark -f *.md > /dev/null
17+
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
18+
remark -f *.md > /dev/null
19+
fi
1820
# build clippy in debug mode and run tests
1921
cargo build --features debugging
2022
cargo test --features debugging

0 commit comments

Comments
 (0)