diff --git a/.travis.yml b/.travis.yml index 2e883329ff0..1af6399823a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,7 @@ branches: - staging.tmp - trying.tmp cache: - cargo: true - timeout: 300 -# Quicker to fetch that during the build than to transmit as part of the cache -before_cache: -- rm -rf /home/travis/.cargo/registry + cargo: false os: - linux - osx @@ -29,3 +25,4 @@ env: - RUSTFLAGS=--cfg=enable_tooltip_tests - RUST_BACKTRACE=1 - RLS_TEST_WAIT_FOR_AGES=1 + - CARGO_INCREMENTAL=0 diff --git a/README.md b/README.md index c7111e25269..208393db633 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/rust-lang/rls.svg?branch=master)](https://travis-ci.org/rust-lang/rls) [![Build status](https://ci.appveyor.com/api/projects/status/cxfejvsqnnc1oygs?svg=true)](https://ci.appveyor.com/project/jonathandturner/rls-x6grn) +[![Build Status](https://travis-ci.org/rust-lang/rls.svg?branch=master)](https://travis-ci.org/rust-lang/rls) [![Nightly status](https://img.shields.io/badge/dynamic/json.svg?label=rls-preview%20(Windows)&url=https%3A%2F%2Fraw.githubusercontent.com%2Frust-lang-nursery%2Frust-toolstate%2Fmaster%2F_data%2Flatest.json&query=%24%5B%3F(%40.tool%3D%3D%22rls%22)%5D.windows&colorB=lightgrey)](https://rust-lang-nursery.github.io/rust-toolstate/) [![Nightly status](https://img.shields.io/badge/dynamic/json.svg?label=rls-preview%20(Linux)&url=https%3A%2F%2Fraw.githubusercontent.com%2Frust-lang-nursery%2Frust-toolstate%2Fmaster%2F_data%2Flatest.json&query=%24%5B%3F(%40.tool%3D%3D%22rls%22)%5D.linux&colorB=lightgrey)](https://rust-lang-nursery.github.io/rust-toolstate/) diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 34e31ae978d..00000000000 --- a/appveyor.yml +++ /dev/null @@ -1,43 +0,0 @@ -branches: - except: - - staging.tmp - - trying.tmp - -environment: - global: - PROJECT_NAME: rls - RUSTFLAGS: --cfg=enable_tooltip_tests - RUST_BACKTRACE: 1 - RLS_TEST_WAIT_FOR_AGES: 1 - matrix: - - TARGET: i686-pc-windows-msvc - CHANNEL: nightly - BITS: 32 - - TARGET: x86_64-pc-windows-msvc - CHANNEL: nightly - BITS: 64 - -install: - - set PATH=C:\msys64\mingw%BITS%\bin;C:\msys64\usr\bin;%PATH% - - curl -sSf -o rustup-init.exe https://win.rustup.rs - # Install rust - - rustup-init.exe -y --default-host %TARGET% --default-toolchain %CHANNEL%-%TARGET% - - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin - # Required for Racer autoconfiguration - - rustup component add rust-src - - rustup component add rust-analysis - # Print version info - - rustc -Vv - - cargo -V - - -build: false - -test_script: - # compile #[cfg(not(test))] code - - cargo build --verbose - - cargo test --verbose - -cache: - - target -> Cargo.lock - - C:\Users\appveyor\.cargo\registry -> Cargo.lock