diff options
| author | Philipp Hansch <dev@phansch.net> | 2018-10-12 09:27:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-12 09:27:32 +0200 |
| commit | e03a06b28530ef219fbae8607e0b8e08243fa039 (patch) | |
| tree | c2fddee5f924934db7a2e98185fd17c7c1e9d63f | |
| parent | 9d3373137b74a403281b293b19ab9346773af073 (diff) | |
| parent | f5a38f2323006fb56cc730cc1313f9578bc84c68 (diff) | |
| download | rust-e03a06b28530ef219fbae8607e0b8e08243fa039.tar.gz rust-e03a06b28530ef219fbae8607e0b8e08243fa039.zip | |
Merge pull request #3300 from phansch/travis_windows
Add Travis windows build
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rwxr-xr-x | ci/base-tests.sh | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 6d44c7faa93..5446f1ab568 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ rust: nightly os: - linux - osx + - windows sudo: false @@ -23,7 +24,7 @@ before_install: install: - | - if [ -z ${INTEGRATION} ]; then + if [ -z ${INTEGRATION} ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then . $HOME/.nvm/nvm.sh nvm install stable nvm use stable @@ -36,6 +37,8 @@ matrix: env: BASE_TESTS=true - os: linux env: BASE_TESTS=true + - os: windows + env: BASE_TEST=true - env: INTEGRATION=rust-lang/cargo - env: INTEGRATION=rust-lang-nursery/rand - env: INTEGRATION=rust-lang-nursery/stdsimd @@ -49,10 +52,14 @@ matrix: - env: INTEGRATION=serde-rs/serde - env: INTEGRATION=Geal/nom - env: INTEGRATION=hyperium/hyper + allow_failures: + - os: windows + env: BASE_TEST=true # prevent these jobs with default env vars exclude: - os: linux - os: osx + - os: windows script: - | diff --git a/ci/base-tests.sh b/ci/base-tests.sh index ebf4a127cdc..72a38ee5e58 100755 --- a/ci/base-tests.sh +++ b/ci/base-tests.sh @@ -14,7 +14,9 @@ set -ex echo "Running clippy base tests" PATH=$PATH:./node_modules/.bin -remark -f *.md > /dev/null +if [ "$TRAVIS_OS_NAME" == "linux" ]; then + remark -f *.md > /dev/null +fi # build clippy in debug mode and run tests cargo build --features debugging cargo test --features debugging |