aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hansch <[email protected]>2018-11-07 15:59:43 +0000
committerPhilipp Hansch <[email protected]>2018-11-07 15:59:43 +0000
commit61a157db8c5f897b7bf3d7e30578a8ac6ee56349 (patch)
treed64f0eee2b1d05e203952ad1382d68738fcc0878
parentbe24e9fa34f218697087bc7834d006ac4460f8f0 (diff)
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.
-rw-r--r--.travis.yml11
1 files changed, 6 insertions, 5 deletions
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
16 16
17matrix: 17matrix:
18 include: 18 include:
19 - os: windows
20 before_script:
21 - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.txt
22 - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.rs
23 <<: *rust_build
24 - os: linux 19 - os: linux
25 <<: *rust_build 20 <<: *rust_build
26 # - language: rust 21 # - language: rust
@@ -38,6 +33,12 @@ matrix:
38 - cd editors/code && npm ci && npm run travis 33 - cd editors/code && npm ci && npm run travis
39 34
40 allow_failures: 35 allow_failures:
36 - os: windows
37 if: branch = master
38 before_script:
39 - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.txt
40 - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.rs
41 <<: *rust_build
41 - rust nightly 42 - rust nightly
42 43
43branches: 44branches: