From 645c43e8f8e74ff9ae762701ea31621055592665 Mon Sep 17 00:00:00 2001
From: sarmstrong <stuart.armstrong@wilix.org>
Date: Fri, 9 Jun 2023 12:27:31 +0300
Subject: [PATCH 1/4] Add cache action

---
 .gitea/workflows/java-pull-request-check-template.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/java-pull-request-check-template.yml b/.gitea/workflows/java-pull-request-check-template.yml
index 5478268..84093ad 100644
--- a/.gitea/workflows/java-pull-request-check-template.yml
+++ b/.gitea/workflows/java-pull-request-check-template.yml
@@ -62,6 +62,7 @@ jobs:
 
       - name: run gradle sonar scan
         if: ${{ inputs.sonar_enabled }}
+        uses: actions/cache@v3
         env:
           SONAR_USER_HOME: "/opt/hostedtoolcache/.sonar"
         run: ./gradlew sonar -i -s

From a00ba449688e3c6b9b76871d530d99aa76dfed47 Mon Sep 17 00:00:00 2001
From: sarmstrong <stuart.armstrong@wilix.org>
Date: Fri, 9 Jun 2023 12:55:17 +0300
Subject: [PATCH 2/4] Updates

---
 .../workflows/java-pull-request-check-template.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/java-pull-request-check-template.yml b/.gitea/workflows/java-pull-request-check-template.yml
index 84093ad..ebab771 100644
--- a/.gitea/workflows/java-pull-request-check-template.yml
+++ b/.gitea/workflows/java-pull-request-check-template.yml
@@ -60,9 +60,21 @@ jobs:
           secrets: |
             ${{ inputs.vault_secrets_base_path }} sonarqube_token | SONAR_TOKEN ;
 
+      - name: Cache sonar modules
+        id: cache-sonar
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-sonar-modules
+        with:
+          path: /opt/hostedtoolcache/.sonar/
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
       - name: run gradle sonar scan
         if: ${{ inputs.sonar_enabled }}
-        uses: actions/cache@v3
         env:
           SONAR_USER_HOME: "/opt/hostedtoolcache/.sonar"
         run: ./gradlew sonar -i -s

From 7bbc00393ca46a18fa7c719a0bd2f490836c5b81 Mon Sep 17 00:00:00 2001
From: sarmstrong <stuart.armstrong@wilix.org>
Date: Fri, 9 Jun 2023 13:04:06 +0300
Subject: [PATCH 3/4] Updates

---
 .gitea/workflows/java-pull-request-check-template.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitea/workflows/java-pull-request-check-template.yml b/.gitea/workflows/java-pull-request-check-template.yml
index ebab771..965b065 100644
--- a/.gitea/workflows/java-pull-request-check-template.yml
+++ b/.gitea/workflows/java-pull-request-check-template.yml
@@ -67,7 +67,7 @@ jobs:
           cache-name: cache-sonar-modules
         with:
           path: /opt/hostedtoolcache/.sonar/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/build.gradle','**/settings.gradle') }}
           restore-keys: |
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
@@ -75,8 +75,6 @@ jobs:
 
       - name: run gradle sonar scan
         if: ${{ inputs.sonar_enabled }}
-        env:
-          SONAR_USER_HOME: "/opt/hostedtoolcache/.sonar"
         run: ./gradlew sonar -i -s
 
       - name: dockerfile lint check

From c55dc1fe4c37336b371c88b6b5f2196e0dd96add Mon Sep 17 00:00:00 2001
From: sarmstrong <stuart.armstrong@wilix.org>
Date: Fri, 9 Jun 2023 13:12:42 +0300
Subject: [PATCH 4/4] Update

---
 .gitea/workflows/java-pull-request-check-template.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/java-pull-request-check-template.yml b/.gitea/workflows/java-pull-request-check-template.yml
index 965b065..b4ca4c5 100644
--- a/.gitea/workflows/java-pull-request-check-template.yml
+++ b/.gitea/workflows/java-pull-request-check-template.yml
@@ -66,7 +66,7 @@ jobs:
         env:
           cache-name: cache-sonar-modules
         with:
-          path: /opt/hostedtoolcache/.sonar/
+          path: /root/.sonar/cache
           key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/build.gradle','**/settings.gradle') }}
           restore-keys: |
             ${{ runner.os }}-build-${{ env.cache-name }}-