From e452aa7d8b03aba6ff865158f0505cd14c83cef9 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@anl.gov>
Date: Fri, 1 Oct 2021 11:52:35 -0500
Subject: [PATCH] GHA: Back out cache key changes but add rtems_target

---
 .github/workflows/ci-scripts-build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml
index 6b5d900..52f122e 100644
--- a/.github/workflows/ci-scripts-build.yml
+++ b/.github/workflows/ci-scripts-build.yml
@@ -42,7 +42,6 @@ jobs:
       fail-fast: false
       matrix:
         # Job names also name artifacts, character limitations apply
-        # 'name' is also used for the cache key
         include:
           - os: ubuntu-20.04
             cmp: gcc
@@ -149,7 +148,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/.cache
-        key: ${{ matrix.name }}
+        key: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.cmp }}/${{ matrix.configuration }}/${{ matrix.wine }}${{ matrix.rtems }}/${{ matrix.rtems_target }}/${{ matrix.extra }}
     - name: Automatic core dump analysis
       uses: mdavidsaver/ci-core-dumper@master
     - name: "apt-get install"