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

@@ -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/[email protected]
     - name: msbuild

.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
+