1 files changed, 35 insertions, 35 deletions
diff --git a/.travis.yml b/.travis.yml
index bd15d39c1..a9e4d43b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,47 +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
-    - RUSTFLAGS='-D warnings' cargo test
+        - RUSTFLAGS='-D warnings' cargo test
-  env:
+    env:
-    RUSTFLAGS: '-D warnings'
+        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:
-    # Because Travis-Windows-Rust can be flaky
+        # Because Travis-Windows-Rust can be flaky
-    # We still support Windows and want the tests to be succeeding,
+        # We still support Windows and want the tests to be succeeding,
-    # but there are too many spurious failures
+        # but there are too many spurious failures
-    - os: windows
+        - os: windows
 branches:
-  only:
+    only:
-    - staging
+        - staging
-    - master
+        - master
-    - trying
+        - trying

diff --git a/.travis.yml b/.travis.yml index bd15d39c1..a9e4d43b6 100644 --- a/.travis.yml +++ b/.travis.yml
@@ -1,47 +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	- RUSTFLAGS='-D warnings' cargo test	16	- RUSTFLAGS='-D warnings' cargo test
17	env:	17	env:
18	RUSTFLAGS: '-D warnings'	18	RUSTFLAGS: -D warnings
19		19
20	matrix:	20	matrix:
21	include:	21	include:
22	- os: linux	22	- os: linux
23	<<: *rust_build	23	<<: *rust_build
24	- language: node_js	24	- language: node_js
25	node_js: node	25	node_js: node
26	before_script: false	26	before_script: false
27	script:	27	script:
28	- cd editors/code && npm ci && npm run travis	28	- cd editors/code && npm ci && npm run travis
29		29
30	- os: windows	30	- os: windows
31	if: branch = master	31	if: branch = master
32	before_script:	32	before_script:
33	- dos2unix ./crates/ra_syntax/tests/data/parser/*/.txt	33	- dos2unix ./crates/ra_syntax/tests/data/parser/*/.txt
34	- dos2unix ./crates/ra_syntax/tests/data/parser/*/.rs	34	- dos2unix ./crates/ra_syntax/tests/data/parser/*/.rs
35	<<: *rust_build	35	<<: *rust_build
36		36
37	allow_failures:	37	allow_failures:
38	# Because Travis-Windows-Rust can be flaky	38	# Because Travis-Windows-Rust can be flaky
39	# We still support Windows and want the tests to be succeeding,	39	# We still support Windows and want the tests to be succeeding,
40	# but there are too many spurious failures	40	# but there are too many spurious failures
41	- os: windows	41	- os: windows
42		42
43	branches:	43	branches:
44	only:	44	only:
45	- staging	45	- staging
46	- master	46	- master
47	- trying	47	- trying