Adjust the caching some more and debuggin

Author: wilwade

.github/workflows/verify-pr-commit.yml

@@ -150,9 +150,10 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.cargo/
-          key: cargo-registry-${{matrix.build-profile}}-${{github.ref_name}}-${{hashFiles('**/Cargo.lock')}}
+          key: cargo-${{matrix.build-profile}}-${{github.ref_name}}-${{hashFiles('**/Cargo.lock')}}
           restore-keys: |
-            cargo-registry-${{matrix.build-profile}}-${{github.ref_name}}-
+            cargo-${{matrix.build-profile}}-${{github.ref_name}}-
+            cargo-${{matrix.build-profile}}-
       - name: cargo fetch for ${{matrix.build-profile}}
         run: |
           cargo fetch --locked
@@ -230,9 +231,10 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: ~/.cargo/
-          key: cargo-registry-${{matrix.build-profile}}-${{github.ref_name}}-${{hashFiles('**/Cargo.lock')}}
-          restore-keys: |
-            cargo-registry-${{matrix.build-profile}}-${{github.ref_name}}-
+          key: cargo-${{matrix.build-profile}}-${{github.ref_name}}-${{hashFiles('**/Cargo.lock')}}
+      - name: Check cache hit
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: echo "Something is wrong, no cache found!" && exit 1
       # # XXX Keep this step as it lets us skip full binary builds during development/testing
       # - name: Cache Binary for Testing
       #   id: cache-binary
@@ -289,8 +291,15 @@ jobs:
     steps:
       - name: Check Out Repository
         uses: actions/checkout@v4
+      - name: Rust Cache Restore
+        uses: actions/cache/restore@v4
+        with:
+          path: ~/.cargo/
+          key: cargo-debug-${{github.ref_name}}-${{hashFiles('**/Cargo.lock')}}
       - name: Verify Rust Code Formatting
         run: |
+          whoami
+          rustup +${{env.NIGHTLY_TOOLCHAIN}} show
           cargo +${{env.NIGHTLY_TOOLCHAIN}} fmt --check
 
   lint-rust-code:
@@ -306,9 +315,7 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: ~/.cargo/
-          key: cargo-registry-debug-${{github.ref_name}}-${{hashFiles('**/Cargo.lock')}}
-          restore-keys: |
-            cargo-registry-debug-${{github.ref_name}}-
+          key: cargo-debug-${{github.ref_name}}-${{hashFiles('**/Cargo.lock')}}
       - name: Lint
         # Fail on warnings
         run: |
@@ -329,9 +336,7 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: ~/.cargo/
-          key: cargo-registry-debug-${{github.ref_name}}-${{hashFiles('**/Cargo.lock')}}
-          restore-keys: |
-            cargo-registry-debug-${{github.ref_name}}-
+          key: cargo-debug-${{github.ref_name}}-${{hashFiles('**/Cargo.lock')}}
       - name: Build Docs
         run: |
           RUSTC_BOOTSTRAP=1 RUSTDOCFLAGS="--enable-index-page --check -Zunstable-options" cargo doc --no-deps --workspace --locked --features frequency
@@ -349,9 +354,7 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: ~/.cargo/
-          key: cargo-registry-debug-${{github.ref_name}}-${{hashFiles('**/Cargo.lock')}}
-          restore-keys: |
-            cargo-registry-debug-${{github.ref_name}}-
+          key: cargo-debug-${{github.ref_name}}-${{hashFiles('**/Cargo.lock')}}
       - name: Check
         run: SKIP_WASM_BUILD= cargo check --locked --features runtime-benchmarks,frequency-lint-check
 
@@ -371,9 +374,7 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: ~/.cargo/
-          key: cargo-registry-debug-${{github.ref_name}}-${{hashFiles('**/Cargo.lock')}}
-          restore-keys: |
-            cargo-registry-debug-${{github.ref_name}}-
+          key: cargo-debug-${{github.ref_name}}-${{hashFiles('**/Cargo.lock')}}
       - name: Run Tests
         run: cargo test --locked --features runtime-benchmarks,frequency-lint-check --workspace
 
@@ -390,9 +391,7 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: ~/.cargo/
-          key: cargo-registry-debug-${{github.ref_name}}-${{hashFiles('**/Cargo.lock')}}
-          restore-keys: |
-            cargo-registry-debug-${{github.ref_name}}-
+          key: cargo-debug-${{github.ref_name}}-${{hashFiles('**/Cargo.lock')}}
       - name: Generate and Upload Code Coverage
         id: codecov
         uses: ./.github/workflows/common/codecov
@@ -450,9 +449,7 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: ~/.cargo/
-          key: cargo-registry-${{matrix.build-profile}}-${{github.ref_name}}-${{hashFiles('**/Cargo.lock')}}
-          restore-keys: |
-            cargo-registry-${{matrix.build-profile}}-${{github.ref_name}}-
+          key: cargo-${{matrix.build-profile}}-${{github.ref_name}}-${{hashFiles('**/Cargo.lock')}}
       - name: Extract Runtime Spec Version
         run: |
           echo "RUNTIME_SPEC_VERSION=$(awk '/spec_version:/ {match($0, /[0-9]+/); print substr($0, RSTART, RLENGTH); exit}' \