1 files changed, 20 insertions, 21 deletions

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index abdec602e..e7e0d599e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -18,6 +18,8 @@ jobs:
       RUSTFLAGS: -D warnings
       CARGO_INCREMENTAL: 0
       RUN_SLOW_TESTS: 1
+      RUSTUP_MAX_RETRIES: 10
+      CARGO_NET_RETRY: 10
     steps:
 
       - name: Checkout repository
@@ -39,7 +41,19 @@ jobs:
           override: true
           components: rustfmt, rust-src
 
-      - name: Cargo target cache
+      - 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
@@ -56,28 +70,13 @@ jobs:
         with:
           command: test
 
-      - name: Prepare build directory for cache (UNIX)
-        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
-        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 \
-          && rm ./target/.slow_tests_cookie
+      - name: Prepare cache
+        run: cargo xtask pre-cache
 
-      - name: Prepare build directory for cache (Windows)
+      - name: Prepare cache 2
         if: matrix.os == 'windows-latest'
-        run: >-
-          (Get-ChildItem ./target/debug -Recurse -Depth 1 -File | Remove-Item) -and
-          (Remove-Item -Force -Recurse ./target/debug/deps/*ra_*) -and
-          (Remove-Item -Force -Recurse ./target/debug/deps/*heavy_test*) -and
-          (Remove-Item -Force -Recurse ./target/debug/deps/*gen_lsp*) -and
-          (Remove-Item -Force -Recurse ./target/debug/deps/*thread_worker*) -and
-          (Remove-Item -Force -Recurse ./target/debug/.fingerprint/*ra_*) -and
-          (Remove-Item -Force -Recurse ./target/debug/.fingerprint/*heavy_test*) -and
-          (Remove-Item -Force -Recurse ./target/debug/.fingerprint/*gen_lsp*) -and
-          (Remove-Item -Force -Recurse ./target/debug/.fingerprint/*thread_worker*) -and
-          (Remove-Item -Force ./target/.rustc_info.json) -and
-          (Remove-Item ./target/.slow_tests_cookie)
+        run: Remove-Item ./target/debug/xtask.exe
+
 
   type-script:
     name: TypeScript