From 6a13619794b9341d7db49775af655ef573e3a957 Mon Sep 17 00:00:00 2001
From: Puneet Behl <behlp@unityfoundation.io>
Date: Wed, 10 Jan 2024 15:02:00 +0530
Subject: [PATCH 1/2] Update groovy-joint-workflow.yml

Cache the local ~/.m2 and groovy based on the commit SHA for short lived cache
---
 .github/workflows/groovy-joint-workflow.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/groovy-joint-workflow.yml b/.github/workflows/groovy-joint-workflow.yml
index 3051f491d0a..2cdd25f1d88 100644
--- a/.github/workflows/groovy-joint-workflow.yml
+++ b/.github/workflows/groovy-joint-workflow.yml
@@ -48,9 +48,7 @@ jobs:
           path: |
             ~/groovy
             ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
+          key: cache-local-groovy-maven-{{ github.sha }}
       - name: Checkout Groovy 3_0_X (Grails 5 and later)
         if: startsWith(github.ref, 'refs/heads/6.') || startsWith(github.base_ref, '6.') || startsWith(github.ref, 'refs/heads/5.') || startsWith(github.base_ref, '5.')
         run: cd .. && git clone --depth 1 https://github.com/apache/groovy.git -b GROOVY_3_0_X --single-branch
@@ -137,9 +135,7 @@ jobs:
           path: |
             ~/groovy
             ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
+          key: cache-local-groovy-maven-{{ github.sha }}
       - name: Set CI_GROOVY_VERSION for Grails
         run: |
           echo "CI_GROOVY_VERSION=${{needs.build_groovy.outputs.groovyVersion}}" >> $GITHUB_ENV

From c993e39f47470baa6592bfed828d807d2008250f Mon Sep 17 00:00:00 2001
From: Puneet Behl <behlp@unityfoundation.io>
Date: Wed, 10 Jan 2024 15:05:54 +0530
Subject: [PATCH 2/2] Add the missing $ for GitHub Expression

---
 .github/workflows/groovy-joint-workflow.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/groovy-joint-workflow.yml b/.github/workflows/groovy-joint-workflow.yml
index 2cdd25f1d88..35dd6819d1b 100644
--- a/.github/workflows/groovy-joint-workflow.yml
+++ b/.github/workflows/groovy-joint-workflow.yml
@@ -48,7 +48,7 @@ jobs:
           path: |
             ~/groovy
             ~/.m2/repository
-          key: cache-local-groovy-maven-{{ github.sha }}
+          key: cache-local-groovy-maven-${{ github.sha }}
       - name: Checkout Groovy 3_0_X (Grails 5 and later)
         if: startsWith(github.ref, 'refs/heads/6.') || startsWith(github.base_ref, '6.') || startsWith(github.ref, 'refs/heads/5.') || startsWith(github.base_ref, '5.')
         run: cd .. && git clone --depth 1 https://github.com/apache/groovy.git -b GROOVY_3_0_X --single-branch
@@ -135,7 +135,7 @@ jobs:
           path: |
             ~/groovy
             ~/.m2/repository
-          key: cache-local-groovy-maven-{{ github.sha }}
+          key: cache-local-groovy-maven-${{ github.sha }}
       - name: Set CI_GROOVY_VERSION for Grails
         run: |
           echo "CI_GROOVY_VERSION=${{needs.build_groovy.outputs.groovyVersion}}" >> $GITHUB_ENV