&self -> self

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index eb89ce8ec60bd1cd1fe5fb4f8081fb8c49f33709..e5960ebca4ee12b70e7dc4cac1744e3fb1f07045 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,45 +1,66 @@
 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*}
+    - find ./target/debug -maxdepth 1 -type f -delete
+    - rm -fr ./target/debug/{deps,.fingerprint}/{*ra_*,*test*,*gen_lsp*,*thread_worker*}
     - rm -f  ./target/.rustc_info.json
 
-build: &rust_build
-    language: rust
-    rust: 1.31.1
-    script:
-        - cargo gen-tests --verify
-        - cargo gen-syntax --verify
-        - cargo test --no-run  # let's measure compile time separately
-        - cargo test
-    env:
-        - RUSTFLAGS="-D warnings", CARGO_INCREMENTAL=0
-
 matrix:
     include:
-        - os: linux
-          <<: *rust_build
-        - language: node_js
-          node_js: node
-          before_script: false
+        - name: "Rust Tests"
+          os: linux
+          dist: xenial
+          language: rust
+          rust: stable
           script:
-              - cd editors/code && npm ci && npm run travis
+              - rustup component add rustfmt
+              - rustup component add rust-src
+              - cargo test --no-run  # let's measure compile time separately
+              - cargo test
+          env:
+              - RUSTFLAGS="-D warnings", CARGO_INCREMENTAL=0
 
-        - os: windows
-          if: branch = master
+        - name: "Rust Docs"
+          os: linux
+          if: branch = master AND type = push
           before_script:
-              - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.txt
-              - dos2unix ./crates/ra_syntax/tests/data/parser/**/*.rs
-          <<: *rust_build
+              - DEPLOY_DOCS=1
+          language: rust
+          rust: stable
+          script:
+              - cargo doc --all --no-deps
+          env:
+              - RUSTFLAGS="-D warnings", CARGO_INCREMENTAL=0
 
-    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
+        - name: "VS Code Tests"
+          os: linux
+          language: node_js
+          dist: xenial
+          node_js: node
+          services:
+            - xvfb
+          before_install: cd editors/code
+          install:
+            - npm install
+            - npm run vscode:prepublish
+          script:
+            - npm ci
+            - npm run travis
+          env:
+            - CXX="g++-4.9", CC="gcc-4.9"
 
 branches:
     only:
         - staging
         - master
         - trying
+
+deploy:
+    provider: pages
+    skip-cleanup: true
+    github-token: $DOCS_TOKEN  # Set in the settings page of your repository, as a secure variable
+    keep-history: true
+    local-dir: target/doc
+    branch: gh-pages
+    on:
+        branch: master
+        condition: $DEPLOY_DOCS = 1