From be24e9fa34f218697087bc7834d006ac4460f8f0 Mon Sep 17 00:00:00 2001
From: Philipp Hansch <dev@phansch.net>
Date: Tue, 6 Nov 2018 20:43:08 +0100
Subject: Add Travis Windows build

---
 .travis.yml | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index d09ce876a..49f498d55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,14 +6,23 @@ before_cache:
 env:
   - CARGO_INCREMENTAL=0
 
+build: &rust_build
+  language: rust
+  rust: beta
+  script:
+    - cargo gen-tests --verify
+    - cargo gen-syntax --verify
+    - cargo test
+
 matrix:
   include:
-    - language: rust
-      rust: beta
-      script:
-        - cargo gen-syntax --verify
-        - cargo gen-tests --verify
-        - cargo test
+    - 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
     #   rust: nightly
     #   before_script:
-- 
cgit v1.2.3


From 61a157db8c5f897b7bf3d7e30578a8ac6ee56349 Mon Sep 17 00:00:00 2001
From: Philipp Hansch <dev@phansch.net>
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