From 6af68bcf81dfa43c867aba29caacc17dc0c4aac3 Mon Sep 17 00:00:00 2001
From: "Bobby R. Bruce" <bbruce@ucdavis.edu>
Date: Mon, 23 Sep 2024 13:16:01 -0700
Subject: [PATCH] tests,misc: Update weekly/daily caches

---
 .github/workflows/daily-tests.yaml  | 22 ++++++++++++++++------
 .github/workflows/weekly-tests.yaml | 12 +++++++++---
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/daily-tests.yaml b/.github/workflows/daily-tests.yaml
index 97432f53fa..e73a42a512 100644
--- a/.github/workflows/daily-tests.yaml
+++ b/.github/workflows/daily-tests.yaml
@@ -19,10 +19,12 @@ jobs:
         steps:
             - uses: actions/checkout@v4
             - name: Cache build/ALL
-              uses: actions/cache@v4
+              uses: actions/cache/restore@v4
               with:
                   path: build/ALL
-                  key: testlib-build-all
+                  key: testlib-build-all-${{ hashFiles('src/**') }}
+                  restore-keys: |
+                      testlib-build-all
             - name: ALL/unittests.${{ matrix.type }} UnitTests
               run: scons build/ALL/unittests.${{ matrix.type }} -j $(nproc)
 
@@ -45,13 +47,17 @@ jobs:
               uses: actions/cache@v4
               with:
                   path: build/NULL
-                  key: testlib-build-null
+                  key: testlib-build-null-${{ hashFiles('src/**') }}
+                  restore-keys: |
+                      testlib-build-null
 
             - name: Cache build/ALL
               uses: actions/cache@v4
               with:
                   path: build/ALL
-                  key: testlib-build-all
+                  key: testlib-build-all-${{ hashFiles('src/**') }}
+                  restore-keys: |
+                      testlib-build-all
 
             - name: long ${{ matrix.test-type }} tests
               working-directory: ${{ github.workspace }}/tests
@@ -87,7 +93,9 @@ jobs:
               uses: actions/cache@v4
               with:
                   path: build/ALL
-                  key: testlib-build-all
+                  key: testlib-build-all-${{ hashFiles('src/**') }}
+                  restore-keys: |
+                      testlib-build-all
 
             - name: long ${{ matrix.test-type }} gem5_library_example_tests
               working-directory: ${{ github.workspace }}/tests
@@ -118,7 +126,9 @@ jobs:
               uses: actions/cache@v4
               with:
                   path: build/VEGA_X86
-                  key: testlib-build-vega
+                  key: testlib-build-vega-${{ hashFiles('src/**') }}
+                  restore-keys: |
+                      testlib-build-vega
 
             - name: Run Testlib GPU Tests
               working-directory: ${{ github.workspace }}/tests
diff --git a/.github/workflows/weekly-tests.yaml b/.github/workflows/weekly-tests.yaml
index ef20cab5ea..45258c074c 100644
--- a/.github/workflows/weekly-tests.yaml
+++ b/.github/workflows/weekly-tests.yaml
@@ -27,7 +27,9 @@ jobs:
               uses: actions/cache@v4
               with:
                   path: build/ALL
-                  key: testlib-build-all
+                  key: testlib-build-all-${{ hashFiles('src/**') }}
+                  restore-keys: |
+                      testlib-build-all
 
             - name: very-long ${{ matrix.test-type }}
               working-directory: ${{ github.workspace }}/tests
@@ -57,7 +59,9 @@ jobs:
               uses: actions/cache@v4
               with:
                   path: build/VEGA_X86
-                  key: testlib-build-vega
+                  key: testlib-build-vega-${{ hashFiles('src/**') }}
+                  restore-keys: |
+                      testlib-build-vega
 
             - name: Run Testlib GPU Tests
               working-directory: ${{ github.workspace }}/tests
@@ -86,7 +90,9 @@ jobs:
               uses: actions/cache/restore@v4
               with:
                   path: build/ALL
-                  key: testlib-build-all
+                  key: testlib-build-all-${{ hashFiles('src/**') }}
+                  restore-keys: |
+                      testlib-build-all
 
               # gem5 is built separately because it depends on the DRAMSys library
             - name: Build gem5