From e1e295182ef9934a2c5af8a545aafaaced15f2eb Mon Sep 17 00:00:00 2001
From: Joe Baker <joe.baker@thenational.academy>
Date: Fri, 29 Nov 2024 10:31:44 +0000
Subject: [PATCH] refactor: run sonar after jest

---
 .github/workflows/sonarcloud.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index a0222487d..30bb4500d 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -8,6 +8,12 @@ on:
     types: [opened, synchronize, reopened]
   merge_group:
 
+  workflow_run:
+    workflows:
+      - Jest Tests and Coverage
+    types:
+      - completed
+
 jobs:
   sonarcloud:
     runs-on: ubuntu-latest
@@ -57,11 +63,6 @@ jobs:
           echo "Displaying contents of coverage directories..."
           find . -type d -name "coverage" -exec ls -lah {} \;
 
-      - name: List uploaded artifacts
-        run: |
-          echo "Listing uploaded artifacts..."
-          ls -lah artifact-check || echo "No artifacts found."
-
       - name: Verify downloaded artifacts
         run: |
           echo "Verifying downloaded artifacts..."
@@ -75,6 +76,7 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: coverage
+          path: coverage
 
       - name: SonarCloud scan
         uses: sonarsource/sonarcloud-github-action@master
@@ -85,4 +87,4 @@ jobs:
           args: >
             -Dsonar.verbose=true
             -Dsonar.projectVersion=${{ steps.app-version.outputs.version }}
-            -Dsonar.javascript.lcov.reportPaths=**/lcov.info
+            -Dsonar.javascript.lcov.reportPaths=coverage/**/lcov.info