Cache v2, disambiguate caches and install sweep after caching

Author: Kixiron

.github/workflows/ci.yml

@@ -17,28 +17,28 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: cargo-sweep
 
       - name: Cache directories
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: |
             ~/.cargo/registry
             ~/.cargo/bin
             ~/.cargo/git
-          key: cargo-dirs-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: cargo-dirs-
+          key: cargo-test-dirs-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: cargo-test-dirs-
       - name: Cache build
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: target
-          key: cargo-build-${{ steps.install.outputs.rustc_hash }}-${{ hashFiles('**/Cargo.lock') }}
+          key: cargo-test-build-${{ steps.install.outputs.rustc_hash }}-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
-            cargo-build-${{ steps.install.outputs.rustc_hash }}-
-            cargo-build-
+            cargo-test-build-${{ steps.install.outputs.rustc_hash }}-
+            cargo-test-build-
+      - uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: cargo-sweep
 
       - name: Register artifacts
         uses: actions-rs/cargo@v1
@@ -102,28 +102,28 @@ jobs:
           toolchain: stable
           override: true
           components: clippy
-      - uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: cargo-sweep
 
       - name: Cache directories
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: |
             ~/.cargo/registry
             ~/.cargo/bin
             ~/.cargo/git
-          key: cargo-dirs-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: cargo-dirs-
+          key: cargo-clippy-dirs-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: cargo-clippy-dirs-
       - name: Cache build
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: target
-          key: cargo-build-${{ steps.install.outputs.rustc_hash }}-${{ hashFiles('**/Cargo.lock') }}
+          key: cargo-clippy-${{ steps.install.outputs.rustc_hash }}-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
-            cargo-build-${{ steps.install.outputs.rustc_hash }}-
-            cargo-build-
+            cargo-clippy-${{ steps.install.outputs.rustc_hash }}-
+            cargo-clippy-
+      - uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: cargo-sweep
 
       - name: Register artifacts
         uses: actions-rs/cargo@v1

.github/workflows/deps.yml

@@ -18,10 +18,6 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: cargo-sweep
 
       - name: Cache directories
         uses: actions/cache@v1
@@ -30,16 +26,20 @@ jobs:
             ~/.cargo/registry
             ~/.cargo/bin
             ~/.cargo/git
-          key: cargo-dirs-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: cargo-dirs-
+          key: cargo-deps-dirs-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: cargo-deps-dirs-
       - name: Cache build
         uses: actions/cache@v1
         with:
           path: target
           key: cargo-build-${{ steps.install.outputs.rustc_hash }}-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
-            cargo-build-${{ steps.install.outputs.rustc_hash }}-
-            cargo-build-
+            cargo-deps-build-${{ steps.install.outputs.rustc_hash }}-
+            cargo-deps-build-
+      - uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: cargo-sweep
 
       - name: Register artifacts
         uses: actions-rs/cargo@v1