From e01bc9ec1304d98a3fed0830a8f20c2e4c36dc39 Mon Sep 17 00:00:00 2001
From: George <GeorgeLyon@users.noreply.github.com>
Date: Wed, 25 Oct 2023 14:21:42 -0700
Subject: [PATCH] Tweak cache key logic

---
 .github/workflows/validateDevcontainer.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/validateDevcontainer.yml b/.github/workflows/validateDevcontainer.yml
index c23bbe827e30..a7b8fe23bd8f 100644
--- a/.github/workflows/validateDevcontainer.yml
+++ b/.github/workflows/validateDevcontainer.yml
@@ -40,10 +40,10 @@ jobs:
             git config --global --add safe.directory $PWD
             rm -f .temporary-github-output
             echo "llvm-hash=$(git rev-parse @:./llvm)" >> .temporary-github-output
-            . /etc/lsb-release
-            echo "ubuntu-codename=$DISTRIB_CODENAME" >> .temporary-github-output
+            echo "circt-hash=$(git rev-parse HEAD)" >> .temporary-github-output
+            echo "cache-key-prefix=\"ccache-devcontainer-${{ matrix.devcontainer-name }}-${DISTRIB_ID}_${DISTRIB_RELEASE}"  >> .temporary-github-output
       - name: Export cache key parts
-        id: get-cache-key-parts
+        id: cache-key-parts
         run: |
           cat .temporary-github-output
           cat .temporary-github-output >> $GITHUB_OUTPUT
@@ -53,11 +53,10 @@ jobs:
         uses: actions/cache/restore@v3
         with: 
           path: ccache
-          key: circt-ccache-database-${{ steps.get-cache-key-parts.outputs.ubuntu-codename }}-${{ steps.get-cache-key-parts.outputs.llvm-hash }}-${{ hashFiles('.devcontainer/**') }}
+          key: ${{ steps.cache-key-parts.outputs.cache-key-prefix }}-llvm_${{ steps.cache-key-parts.outputs.llvm-hash }}-circt_${{ steps.cache-key-parts.outputs.circt-hash }}
           restore-keys: |
-            circt-ccache-database-${{ steps.get-cache-key-parts.outputs.ubuntu-codename }}-${{ steps.get-cache-key-parts.outputs.llvm-hash }}-
-            circt-ccache-database-${{ steps.get-cache-key-parts.outputs.ubuntu-codename }}-${{ steps.get-cache-key-parts.outputs.llvm-hash }}-
-            circt-ccache-database-${{ steps.get-cache-key-parts.outputs.ubuntu-codename }}-
+            ${{ steps.cache-key-parts.outputs.cache-key-prefix }}-llvm_${{ steps.cache-key-parts.outputs.llvm-hash }}-circt_
+            ${{ steps.cache-key-parts.outputs.cache-key-prefix }}-llvm_
       
       - name: Initialize ccache
         uses: devcontainers/ci@v0.3
@@ -118,7 +117,7 @@ jobs:
         if: ${{ always() && steps.configure-cmake-project.outcome == 'success' }}
         with: 
           path: ccache
-          key: circt-ccache-database-${{ steps.get-cache-key-parts.outputs.ubuntu-codename }}-${{ steps.get-cache-key-parts.outputs.llvm-hash }}-${{ hashFiles('.devcontainer/**') }}
+          key: ${{ steps.cache-key-parts.outputs.cache-key-prefix }}-llvm_${{ steps.cache-key-parts.outputs.llvm-hash }}-circt_${{ steps.cache-key-parts.outputs.circt-hash }}
       # If evicting everything that wasn't used this workflow does not reduce the cache past its maximum, it may benefit performance to increase the cache size.
       - name: Log ccache estimated usage
         uses: devcontainers/ci@v0.3