From 6b3ef149997de2c1414d4318f009967e130a9b7a Mon Sep 17 00:00:00 2001
From: "Anathan (Ana) Ye" <anaye@duck.com>
Date: Sat, 5 Aug 2023 00:39:08 +1000
Subject: [PATCH] :rocket: update cargo cache

Signed-off-by: Anathan (Ana) Ye <anaye@duck.com>
---
 .github/workflows/check_tests.yml            | 21 +++++++++-----------
 .github/workflows/metadata_diff.yml          |  9 ++++-----
 .github/workflows/publish_draft_releases.yml |  9 ++++-----
 .github/workflows/run_linters.yml            |  9 ++++-----
 4 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/check_tests.yml b/.github/workflows/check_tests.yml
index 59d068848..8c6d22239 100644
--- a/.github/workflows/check_tests.yml
+++ b/.github/workflows/check_tests.yml
@@ -31,13 +31,12 @@ jobs:
           chmod +x $HOME/.local/bin/sccache
           echo "$HOME/.local/bin" >> $GITHUB_PATH
           echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-      - name: cache cargo registry
+      - name: cache cargo
         uses: actions/cache@v2
         with:
           path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-          key: cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+            ~/.cargo
+          key: cargo-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             cargo-
       - name: cache sccache
@@ -106,13 +105,12 @@ jobs:
           chmod +x $HOME/.local/bin/sccache
           echo "$HOME/.local/bin" >> $GITHUB_PATH
           echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-      - name: cache cargo registry
+      - name: cache cargo
         uses: actions/cache@v2
         with:
           path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-          key: cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+            ~/.cargo
+          key: cargo-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             cargo-
       - name: cache sccache
@@ -230,13 +228,12 @@ jobs:
           chmod +x $HOME/.local/bin/sccache
           echo "$HOME/.local/bin" >> $GITHUB_PATH
           echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-      - name: cache cargo registry
+      - name: cache cargo
         uses: actions/cache@v2
         with:
           path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-          key: cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+            ~/.cargo
+          key: cargo-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             cargo-
       - name: cache sccache
diff --git a/.github/workflows/metadata_diff.yml b/.github/workflows/metadata_diff.yml
index cac985253..c29e12e8d 100644
--- a/.github/workflows/metadata_diff.yml
+++ b/.github/workflows/metadata_diff.yml
@@ -43,15 +43,14 @@ jobs:
           chmod +x $HOME/.local/bin/sccache
           echo "$HOME/.local/bin" >> $GITHUB_PATH
           echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-      - name: cache cargo registry
+      - name: cache cargo
         uses: actions/cache@v2
         with:
           path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-          key: cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+            ~/.cargo
+          key: cargo-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
-            cargo-registry-
+            cargo-
       - name: cache sccache
         uses: actions/cache@v2
         continue-on-error: false
diff --git a/.github/workflows/publish_draft_releases.yml b/.github/workflows/publish_draft_releases.yml
index bdc894bb5..1cfefbd86 100644
--- a/.github/workflows/publish_draft_releases.yml
+++ b/.github/workflows/publish_draft_releases.yml
@@ -96,15 +96,14 @@ jobs:
           chmod +x $HOME/.local/bin/sccache
           echo "$HOME/.local/bin" >> $GITHUB_PATH
           echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-      - name: cache cargo registry
+      - name: cache cargo
         uses: actions/cache@v2
         with:
           path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-          key: cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+            ~/.cargo
+          key: cargo-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
-            cargo-registry-
+            cargo-
       - name: cache sccache
         uses: actions/cache@v2
         continue-on-error: false
diff --git a/.github/workflows/run_linters.yml b/.github/workflows/run_linters.yml
index d500a2968..f54c13ba0 100644
--- a/.github/workflows/run_linters.yml
+++ b/.github/workflows/run_linters.yml
@@ -33,15 +33,14 @@ jobs:
           chmod +x $HOME/.local/bin/sccache
           echo "$HOME/.local/bin" >> $GITHUB_PATH
           echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-      - name: cache cargo registry
+      - name: cache cargo
         uses: actions/cache@v2
         with:
           path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-          key: cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+            ~/.cargo
+          key: cargo-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
-            cargo-registry-
+            cargo-
       - name: cache sccache
         uses: actions/cache@v2
         continue-on-error: false