diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-03 16:16:26 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-03 16:16:26 +0000 |
commit | 23d45177e25d6d30945d859a29d516d4058f518f (patch) | |
tree | 002dc2cbf5ffbbd688d60bd0f11aceec33c15801 | |
parent | 33924c0939bb64cdb6fc4644582411a7be1f135d (diff) | |
parent | 4477b8e92f5ccec3fbb312494cf0e113a6c85cce (diff) |
Merge #417
417: travis-compile r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r-- | .travis.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 04bb3be37..86bce93d6 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -10,6 +10,7 @@ build: &rust_build | |||
10 | script: | 10 | script: |
11 | - cargo gen-tests --verify | 11 | - cargo gen-tests --verify |
12 | - cargo gen-syntax --verify | 12 | - cargo gen-syntax --verify |
13 | - cargo test --no-run # let's measure compile time separately | ||
13 | - cargo test | 14 | - cargo test |
14 | env: | 15 | env: |
15 | - RUSTFLAGS="-D warnings", CARGO_INCREMENTAL=0 | 16 | - RUSTFLAGS="-D warnings", CARGO_INCREMENTAL=0 |
@@ -25,7 +26,7 @@ matrix: | |||
25 | - cd editors/code && npm ci && npm run travis | 26 | - cd editors/code && npm ci && npm run travis |
26 | 27 | ||
27 | - os: windows | 28 | - os: windows |
28 | if: branch = master | 29 | if: branch = master AND type = push |
29 | before_script: | 30 | before_script: |
30 | - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.txt | 31 | - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.txt |
31 | - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.rs | 32 | - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.rs |