From 785a12182579277b7b1b0453b1acfbeaa0c325c2 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@users.noreply.github.com>
Date: Mon, 1 May 2023 16:30:22 -0700
Subject: [PATCH] Fix rust dependency caching (#1983)

* fun with rust caching

* kick

* comment out invalid yaml keys for now

* Caching should now work

* re-add/rename key directives

* bump

* bump

* bump
---
 .github/workflows/build.yml    | 45 ++++++++++++++--------------------
 .github/workflows/validate.yml | 15 +++++-------
 2 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 80f7c9a3d..657c8d8c7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,17 +19,14 @@ jobs:
         components: rustfmt, clippy
 
     - name: Set up cargo cache
-      uses: actions/cache@v3
+      uses: Swatinem/rust-cache@v2
       continue-on-error: false
       with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-        restore-keys: ${{ runner.os }}-cargo-
+        key: ${{ runner.os }}-cargo-${{ hashFiles('zeroidc//Cargo.lock') }}
+        shared-key: ${{ runner.os }}-cargo-
+        workspaces: |
+          zeroidc/
+
     - name: make
       run: make
     - name: selftest
@@ -54,17 +51,14 @@ jobs:
         override: true
         components: rustfmt, clippy
     - name: Set up cargo cache
-      uses: actions/cache@v3
+      uses: Swatinem/rust-cache@v2
       continue-on-error: false
       with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-        restore-keys: ${{ runner.os }}-cargo-
+        key: ${{ runner.os }}-cargo-${{ hashFiles('zeroidc//Cargo.lock') }}
+        shared-key: ${{ runner.os }}-cargo-
+        workspaces: |
+          zeroidc/
+
     - name: make
       run: make
     - name: selftest
@@ -89,17 +83,14 @@ jobs:
         override: true
         components: rustfmt, clippy
     - name: Set up cargo cache
-      uses: actions/cache@v3
+      uses: Swatinem/rust-cache@v2
       continue-on-error: false
       with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-        restore-keys: ${{ runner.os }}-cargo-
+        key: ${{ runner.os }}-cargo-${{ hashFiles('zeroidc//Cargo.lock') }}
+        shared-key: ${{ runner.os }}-cargo-
+        workspaces: |
+          zeroidc/
+
     - name: setup msbuild
       uses: microsoft/setup-msbuild@v1.1.3
     - name: msbuild
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 665c34945..55f81e557 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -22,17 +22,13 @@ jobs:
         components: rustfmt, clippy
 
     - name: Set up cargo cache
-      uses: actions/cache@v3
+      uses: Swatinem/rust-cache@v2
       continue-on-error: false
       with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          **/target/
-        key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
-        restore-keys: ${{ runner.os }}-cargo-
+        key: ${{ runner.os }}-cargo-${{ hashFiles('zeroidc//Cargo.lock') }}
+        shared-key: ${{ runner.os }}-cargo-
+        workspaces: |
+          zeroidc/
 
     - name: validate-1m-linux
       env:
@@ -55,3 +51,4 @@ jobs:
       run: |
         sudo chmod +x ./.github/workflows/report.sh
         sudo ./.github/workflows/report.sh
+