aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-11-17 12:50:29 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-11-17 12:50:29 +0000
commitf1d8558cd5fe20a351496c39dbb8e15aa028803c (patch)
treebff7587643311fca68926fb519dcbefeb177c141
parent97532c8bf74b96336c1c553171b3ee787edbc66a (diff)
parentcb659cd262f5b66de01b036e26cd51b04052d488 (diff)
Merge #215
215: Add Travis Windows build r=matklad a=phansch This adds the Windows build to Travis. I had to use the `dos2unix` utility on the parser directory to fix some incorrect line endings. I'm not sure where they are coming from but I guess git is converting them automatically when cloning on Windows. Closes #139 Co-authored-by: Philipp Hansch <[email protected]>
-rw-r--r--.travis.yml22
-rw-r--r--README.md2
-rw-r--r--appveyor.yml19
3 files changed, 16 insertions, 27 deletions
diff --git a/.travis.yml b/.travis.yml
index ecb3b76f4..4c691f670 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,14 +7,18 @@ before_cache:
7env: 7env:
8 - CARGO_INCREMENTAL=0 8 - CARGO_INCREMENTAL=0
9 9
10build: &rust_build
11 language: rust
12 rust: beta
13 script:
14 - cargo gen-tests --verify
15 - cargo gen-syntax --verify
16 - cargo test
17
10matrix: 18matrix:
11 include: 19 include:
12 - language: rust 20 - os: linux
13 rust: beta 21 <<: *rust_build
14 script:
15 - cargo gen-syntax --verify
16 - cargo gen-tests --verify
17 - cargo test
18 # - language: rust 22 # - language: rust
19 # rust: nightly 23 # rust: nightly
20 # before_script: 24 # before_script:
@@ -30,6 +34,12 @@ matrix:
30 - cd editors/code && npm ci && npm run travis 34 - cd editors/code && npm ci && npm run travis
31 35
32 allow_failures: 36 allow_failures:
37 - os: windows
38 if: branch = master
39 before_script:
40 - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.txt
41 - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.rs
42 <<: *rust_build
33 - rust nightly 43 - rust nightly
34 44
35branches: 45branches:
diff --git a/README.md b/README.md
index 1c5398779..a6195237f 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
1# Rust Analyzer 1# Rust Analyzer
2 2
3[![Build Status](https://travis-ci.org/rust-analyzer/rust-analyzer.svg?branch=master)](https://travis-ci.org/rust-analyzer/rust-analyzer) 3[![Build Status](https://travis-ci.org/rust-analyzer/rust-analyzer.svg?branch=master)](https://travis-ci.org/rust-analyzer/rust-analyzer)
4[![Build status](https://ci.appveyor.com/api/projects/status/vtt455oi3hjy9uvk/branch/master?svg=true)](https://ci.appveyor.com/project/matklad/rust-analyzer/branch/master)
5
6 4
7Rust Analyzer is an **experimental** modular compiler frontend for the 5Rust Analyzer is an **experimental** modular compiler frontend for the
8Rust language, which aims to lay a foundation for excellent IDE 6Rust language, which aims to lay a foundation for excellent IDE
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index a32a1e7b8..000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,19 +0,0 @@
1os: Visual Studio 2015
2
3install:
4 - curl https://win.rustup.rs/ --output rustup-init.exe
5 - rustup-init -yv --default-toolchain beta --default-host x86_64-pc-windows-msvc
6 - set PATH=%PATH%;%USERPROFILE%\.cargo\bin
7 - rustc -vV
8 - cargo -vV
9
10build: false
11
12test_script:
13 - cargo test
14
15branches:
16 only:
17 - staging
18 - master
19 - trying