From 61a157db8c5f897b7bf3d7e30578a8ac6ee56349 Mon Sep 17 00:00:00 2001 From: Philipp Hansch Date: Wed, 7 Nov 2018 16:59:43 +0100 Subject: Only build windows on master and allow failure The Windows build is much slower than Linux, so we only build it on master and make the build status not depend on it finishing up. --- .travis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 49f498d55..49d53859d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,11 +16,6 @@ build: &rust_build matrix: include: - - os: windows - before_script: - - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.txt - - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.rs - <<: *rust_build - os: linux <<: *rust_build # - language: rust @@ -38,6 +33,12 @@ matrix: - cd editors/code && npm ci && npm run travis allow_failures: + - os: windows + if: branch = master + before_script: + - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.txt + - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.rs + <<: *rust_build - rust nightly branches: -- cgit v1.2.3