Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes

1 files changed, 21 insertions, 30 deletions

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index bafd7752f..b70d005fb 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,16 +1,23 @@
-name: Continuous integration
-on: [pull_request, push]
+name: CI
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - staging
 
 jobs:
-  rust-tests:
-    name: Rust tests
+  rust:
+    name: Rust
     runs-on: ubuntu-latest
     env:
       RUSTFLAGS: -D warnings
       CARGO_INCREMENTAL: 0
     steps:
+
       - name: Checkout repository
         uses: actions/checkout@v1
+
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
@@ -18,31 +25,32 @@ jobs:
           profile: minimal
           override: true
           components: rustfmt, rust-src
-      - name: Generate lockfile
-        uses: actions-rs/cargo@v1
-        with:
-          command: generate-lockfile
+
       - name: Cargo target cache
         uses: actions/cache@v1
         with:
           path: target
           key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
+
       - name: Compile
         uses: actions-rs/cargo@v1
         with:
           command: test
           args: --no-run
+
       - name: Test
         uses: actions-rs/cargo@v1
         with:
           command: test
+
       - name: Prepare build directory for cache
         run: |
           find ./target/debug -maxdepth 1 -type f -delete && \
           rm -fr ./target/debug/{deps,.fingerprint}/{*ra_*,*heavy_test*,*gen_lsp*,*thread_worker*} && \
           rm -f  ./target/.rustc_info.json
-  vscode-tests:
-    name: VS Code tests
+
+  type-script:
+    name: TypeScript
     runs-on: ubuntu-latest
     env:
       CXX: g++-4.9
@@ -50,25 +58,12 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v1
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          override: true
-      - name: Generate lockfile
-        uses: actions-rs/cargo@v1
-        with:
-          command: generate-lockfile
-      - name: Cargo target cache
-        uses: actions/cache@v1
-        with:
-          path: target
-          key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
+
       - name: Install Nodejs
         uses: actions/setup-node@v1
         with:
           node-version: 12.x
+
       - name: Install xvfb
         run: sudo apt-get install xvfb
       - run: npm ci
@@ -77,10 +72,6 @@ jobs:
         working-directory: ./editors/code
       - run: xvfb-run --auto-servernum npm run travis
         working-directory: ./editors/code
+
       - name: Cleanup xvfb
         uses: bcomnes/cleanup-xvfb@v1
-      - name: Prepare build directory for cache
-        run: |
-          find ./target/debug -maxdepth 1 -type f -delete && \
-          rm -fr ./target/debug/{deps,.fingerprint}/{*ra_*,*heavy_test*,*gen_lsp*,*thread_worker*} && \
-          rm -f  ./target/.rustc_info.json