From 5dbab814813134f45ba186819bc81b822e62d9fb Mon Sep 17 00:00:00 2001 From: DJMcNab <36049421+DJMcNab@users.noreply.github.com> Date: Sat, 29 Dec 2018 10:31:20 +0000 Subject: Reformat .travis.yml (using the vscode prettier extension) TODO: Check this on CI. Maybe we should change the prettier script in `editors/code`, or move it to somewhere else (`tests/format` maybe) Editing the script in editors/code would be easiest as that means we don't have to double install some shared `node_modules` --- .travis.yml | 70 ++++++++++++++++++++++++++++++------------------------------- 1 file 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 - - rm -fr ./target/debug/{deps,.fingerprint}/{*ra_*,*test*,*tools*,*gen_lsp*,*thread_worker*} - - rm -f ./target/.rustc_info.json + - find ./target/debug -type f -maxdepth 1 -delete + - rm -fr ./target/debug/{deps,.fingerprint}/{*ra_*,*test*,*tools*,*gen_lsp*,*thread_worker*} + - rm -f ./target/.rustc_info.json env: - - CARGO_INCREMENTAL=0 + - CARGO_INCREMENTAL=0 build: &rust_build - language: rust - rust: 1.31.1 - script: - - cargo gen-tests --verify - - cargo gen-syntax --verify - - RUSTFLAGS='-D warnings' cargo test - env: - RUSTFLAGS: '-D warnings' + language: rust + rust: 1.31.1 + script: + - cargo gen-tests --verify + - cargo gen-syntax --verify + - RUSTFLAGS='-D warnings' cargo test + env: + RUSTFLAGS: -D warnings matrix: - include: - - os: linux - <<: *rust_build - - language: node_js - node_js: node - before_script: false - script: - - cd editors/code && npm ci && npm run travis + include: + - os: linux + <<: *rust_build + - language: node_js + node_js: node + before_script: false + script: + - cd editors/code && npm ci && npm run travis - - 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 + - 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 - allow_failures: - # 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 + allow_failures: + # 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: - - staging - - master - - trying + only: + - staging + - master + - trying -- cgit v1.2.3