diff --git a/.travis.yml b/.travis.yml index ecb3b76f43b..4c691f670a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,14 +7,18 @@ 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: linux + <<: *rust_build # - language: rust # rust: nightly # before_script: @@ -30,6 +34,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: diff --git a/README.md b/README.md index 1c5398779e3..a6195237f43 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ # Rust Analyzer [![Build Status](https://travis-ci.org/rust-analyzer/rust-analyzer.svg?branch=master)](https://travis-ci.org/rust-analyzer/rust-analyzer) -[![Build status](https://ci.appveyor.com/api/projects/status/vtt455oi3hjy9uvk/branch/master?svg=true)](https://ci.appveyor.com/project/matklad/rust-analyzer/branch/master) - Rust Analyzer is an **experimental** modular compiler frontend for the Rust language, which aims to lay a foundation for excellent IDE diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index a32a1e7b8a5..00000000000 --- a/appveyor.yml +++ /dev/null @@ -1,19 +0,0 @@ -os: Visual Studio 2015 - -install: - - curl https://win.rustup.rs/ --output rustup-init.exe - - rustup-init -yv --default-toolchain beta --default-host x86_64-pc-windows-msvc - - set PATH=%PATH%;%USERPROFILE%\.cargo\bin - - rustc -vV - - cargo -vV - -build: false - -test_script: - - cargo test - -branches: - only: - - staging - - master - - trying