2 files changed, 131 insertions, 32 deletions

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index eab03f581..3a2bdb4a6 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -78,23 +78,6 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: Remove-Item ./target/${{ env.PROFILE }}/xtask.exe
 
-      - name: Creat distribution dir
-        run: mkdir ./dist
-
-      - name: Copy binaries (non-win)
-        if: matrix.os != 'windows-latest'
-        run: cp ./target/${{ env.PROFILE }}/ra_lsp_server* ./dist
-
-      - name: Copy binaries (win)
-        if: matrix.os == 'windows-latest'
-        run: copy ./target/${{ env.PROFILE }}/ra_lsp_server.* ./dist
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v1
-        with:
-          name: executables-${{ matrix.os }}
-          path: ./dist
-
   type-script:
     name: TypeScript
     runs-on: ubuntu-latest
@@ -114,18 +97,3 @@ jobs:
         working-directory: ./editors/code
       - run: npm run package --scripts-prepend-node-path
         working-directory: ./editors/code
-
-      - name: Create distribution directory
-        run: mkdir ./dist
-
-      - name: Copy vscode extension
-        run: mkdir ./dist/code && cp ./editors/code/*.vsix ./dist/code/
-
-      - name: Copy emacs mode
-        run: cp -R ./editors/emacs ./dist/
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v1
-        with:
-          name: editors
-          path: ./dist
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
new file mode 100644
index 000000000..278f5a586
--- /dev/null
+++ b/.github/workflows/release.yaml
@@ -0,0 +1,131 @@
+name: CI
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - staging
+      - trying
+
+jobs:
+  rust:
+    name: Rust
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    env:
+      RUSTFLAGS: -D warnings
+      CARGO_INCREMENTAL: 0
+      RUN_SLOW_TESTS: 1
+      RUSTUP_MAX_RETRIES: 10
+      CARGO_NET_RETRY: 10
+      PROFILE: release
+    steps:
+
+      - name: Checkout repository
+        uses: actions/checkout@v1
+
+      # We need to disable the existing toolchain to avoid updating rust-docs
+      # which takes a long time. The fastest way to do this is to rename the
+      # existing folder, as deleting it takes about as much time as not doing
+      # anything and just updating rust-docs.
+      - name: Rename existing rust toolchain (Windows)
+        if: matrix.os == 'windows-latest'
+        run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old
+
+      - name: Install Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          override: true
+          components: rustfmt, rust-src
+
+      - name: Cache cargo registry
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/registry
+          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Cache cargo index
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/git
+          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Cache cargo target dir
+        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: build
+          args: --release
+
+      - name: Test
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+
+      - name: Prepare cache
+        run: cargo xtask pre-cache
+
+      - name: Prepare cache 2
+        if: matrix.os == 'windows-latest'
+        run: Remove-Item ./target/${{ env.PROFILE }}/xtask.exe
+
+      - name: Creat distribution dir
+        run: mkdir ./dist
+
+      - name: Copy binaries (non-win)
+        if: matrix.os != 'windows-latest'
+        run: cp ./target/${{ env.PROFILE }}/ra_lsp_server* ./dist
+
+      - name: Copy binaries (win)
+        if: matrix.os == 'windows-latest'
+        run: copy ./target/${{ env.PROFILE }}/ra_lsp_server.* ./dist
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          name: executables-${{ matrix.os }}
+          path: ./dist
+
+  type-script:
+    name: TypeScript
+    runs-on: ubuntu-latest
+    env:
+      CXX: g++-4.9
+      CC: gcc-4.9
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v1
+
+      - name: Install Nodejs
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+
+      - run: npm ci
+        working-directory: ./editors/code
+      - run: npm run package --scripts-prepend-node-path
+        working-directory: ./editors/code
+
+      - name: Create distribution directory
+        run: mkdir ./dist
+
+      - name: Copy vscode extension
+        run: mkdir ./dist/code && cp ./editors/code/*.vsix ./dist/code/
+
+      - name: Copy emacs mode
+        run: cp -R ./editors/emacs ./dist/
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          name: editors
+          path: ./dist