1 files changed, 35 insertions, 30 deletions
diff --git a/.travis.yml b/.travis.yml
index 5e11cbd2f..183409acd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,42 +1,47 @@
 cache: cargo
 before_cache:
-  - find ./target/debug -type f -maxdepth 1 -delete
+    - find ./target/debug -type f -maxdepth 1 -delete
-  - rm -fr ./target/debug/{deps,.fingerprint}/{*ra_*,*test*,*tools*,*gen_lsp*,*thread_worker*}
+    - rm -fr ./target/debug/{deps,.fingerprint}/{*ra_*,*test*,*tools*,*gen_lsp*,*thread_worker*}
-  - rm -f  ./target/.rustc_info.json
+    - rm -f  ./target/.rustc_info.json
 env:
-  - CARGO_INCREMENTAL=0
+    - CARGO_INCREMENTAL=0
 build: &rust_build
-  language: rust
+    language: rust
-  rust: 1.31.1
+    rust: 1.31.1
-  script:
+    script:
-    - cargo gen-tests --verify
+        - cargo gen-tests --verify
-    - cargo gen-syntax --verify
+        - cargo gen-syntax --verify
-    - cargo test
+        - cargo test
+    env:
+        - RUSTFLAGS="-D warnings"
 matrix:
-  include:
+    include:
-    - os: linux
+        - os: linux
-      <<: *rust_build
+          <<: *rust_build
-    - language: node_js
+        - language: node_js
-      node_js: node
+          node_js: node
-      before_script: false
+          before_script: false
-      script:
+          script:
-        - cd editors/code && npm ci && npm run travis
+              - cd editors/code && npm ci && npm run travis
-    - os: windows
+        - os: windows
-      if: branch = master
+          if: branch = master
-      before_script:
+          before_script:
-        - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.txt
+              - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.txt
-        - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.rs
+              - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.rs
-      <<: *rust_build
+          <<: *rust_build
-  allow_failures:
+    allow_failures:
-    - os: windows
+        # Because Travis-Windows-Rust can be flaky
+        # We still support Windows and want the tests to be succeeding,
+        # but there are too many spurious failures
+        - os: windows
 branches:
-  only:
+    only:
-    - staging
+        - staging
-    - master
+        - master
-    - trying
+        - trying

diff --git a/.travis.yml b/.travis.yml index 5e11cbd2f..183409acd 100644 --- a/.travis.yml +++ b/.travis.yml
@@ -1,42 +1,47 @@
1	cache: cargo	1	cache: cargo
2	before_cache:	2	before_cache:
3	- find ./target/debug -type f -maxdepth 1 -delete	3	- find ./target/debug -type f -maxdepth 1 -delete
4	- rm -fr ./target/debug/{deps,.fingerprint}/{ra_,test,tools,gen_lsp,thread_worker}	4	- rm -fr ./target/debug/{deps,.fingerprint}/{ra_,test,tools,gen_lsp,thread_worker}
5	- rm -f ./target/.rustc_info.json	5	- rm -f ./target/.rustc_info.json
6		6
7	env:	7	env:
8	- CARGO_INCREMENTAL=0	8	- CARGO_INCREMENTAL=0
9		9
10	build: &rust_build	10	build: &rust_build
11	language: rust	11	language: rust
12	rust: 1.31.1	12	rust: 1.31.1
13	script:	13	script:
14	- cargo gen-tests --verify	14	- cargo gen-tests --verify
15	- cargo gen-syntax --verify	15	- cargo gen-syntax --verify
16	- cargo test	16	- cargo test
		17	env:
		18	- RUSTFLAGS="-D warnings"
17		19
18	matrix:	20	matrix:
19	include:	21	include:
20	- os: linux	22	- os: linux
21	<<: *rust_build	23	<<: *rust_build
22	- language: node_js	24	- language: node_js
23	node_js: node	25	node_js: node
24	before_script: false	26	before_script: false
25	script:	27	script:
26	- cd editors/code && npm ci && npm run travis	28	- cd editors/code && npm ci && npm run travis
27		29
28	- os: windows	30	- os: windows
29	if: branch = master	31	if: branch = master
30	before_script:	32	before_script:
31	- dos2unix ./crates/ra_syntax/tests/data/parser/*/.txt	33	- dos2unix ./crates/ra_syntax/tests/data/parser/*/.txt
32	- dos2unix ./crates/ra_syntax/tests/data/parser/*/.rs	34	- dos2unix ./crates/ra_syntax/tests/data/parser/*/.rs
33	<<: *rust_build	35	<<: *rust_build
34		36
35	allow_failures:	37	allow_failures:
36	- os: windows	38	# Because Travis-Windows-Rust can be flaky
		39	# We still support Windows and want the tests to be succeeding,
		40	# but there are too many spurious failures
		41	- os: windows
37		42
38	branches:	43	branches:
39	only:	44	only:
40	- staging	45	- staging
41	- master	46	- master
42	- trying	47	- trying