JaCoCo script divided into 2 separate ones

Author: chubnastia

.github/workflows/build.yml

@@ -24,22 +24,14 @@ jobs:
         with:
             path: ~/jacoco-0.8.14
             key: ${{ runner.os }}-jacoco-cli-${{ hashFiles('generate-jacoco-report.sh') }}
-            restore-keys: |
-                ${{ runner.os }}-jacoco-cli-
 
       - name: Build with Maven
         run: mvn --batch-mode --update-snapshots package
 
-      - name: Generate JaCoCo Report
+      - name: Get JaCoCo CLI
         run: |
-         chmod +x ./generate-jacoco-report.sh
-         ./generate-jacoco-report.sh
-
-      - name: Upload JaCoCo Report
-        uses: actions/upload-artifact@v4
-        with:
-            name: JaCoCo Coverage Report
-            path: target/coverage-reports/site
+         chmod +x ./get-jacoco.sh
+         ./get-jacoco.sh
 
       - name: JUnit test report
         uses: mikepenz/action-junit-report@v5
@@ -58,3 +50,14 @@ jobs:
         with:
           check_name: pynfs protocol compatibility test
           report_paths: "report/*.xml"
+
+      - name: Generate JaCoCo Report
+        run: |
+          chmod +x ./generate-jacoco-report.sh
+          ./generate-jacoco-report.sh
+
+      - name: Upload JaCoCo Report
+        uses: actions/upload-artifact@v4
+        with:
+          name: JaCoCo Coverage Report
+          path: target/coverage-reports/site

generate-jacoco-report.sh

@@ -11,29 +11,6 @@ REPORT_DIR="$PROJECT_ROOT/target/coverage-reports/site"
 # Ensure the report directory exists
 mkdir -p "$REPORT_DIR"
 
-# Debug: Print paths
-echo "DEBUG: JACOCO_CLI_JAR: $JACOCO_CLI_JAR"
-echo "DEBUG: Checking if $JACOCO_CLI_JAR exists..."
-
-# Check if JaCoCo CLI JAR exists in the cache directory
-if [ ! -f "$JACOCO_CLI_JAR" ]; then
-    echo "JaCoCo CLI JAR not found in cache directory. Downloading..."
-    mkdir -p "$JACOCO_DIR"
-    wget -q "https://github.com/jacoco/jacoco/releases/download/v$JACOCO_VERSION/jacoco-$JACOCO_VERSION.zip" -O "/tmp/jacoco-$JACOCO_VERSION.zip"
-    unzip -q "/tmp/jacoco-$JACOCO_VERSION.zip" -d "$JACOCO_DIR"
-    rm -f "/tmp/jacoco-$JACOCO_VERSION.zip"
-    echo "DEBUG: Downloaded JaCoCo CLI to $JACOCO_DIR"
-    ls -la "$JACOCO_DIR"
-else
-    echo "DEBUG: JaCoCo CLI JAR found at $JACOCO_CLI_JAR"
-fi
-
-# Check if JaCoCo CLI JAR exists after download
-if [ ! -f "$JACOCO_CLI_JAR" ]; then
-    echo "Error: JaCoCo CLI JAR not found at $JACOCO_CLI_JAR"
-    exit 1
-fi
-
 # Find all jacoco-ut.exec files dynamically
 EXEC_FILES=($(find "$PROJECT_ROOT" -name "jacoco-ut.exec" -type f))
 

get-jacoco.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Define paths
+PROJECT_ROOT="${PROJECT_ROOT:-$(pwd)}"
+JACOCO_VERSION="0.8.14"
+JACOCO_DIR="${PROJECT_ROOT}/jacoco-$JACOCO_VERSION"
+JACOCO_CLI_JAR="$JACOCO_DIR/lib/jacococli.jar"
+
+# Debug: Print paths
+echo "DEBUG: JACOCO_CLI_JAR: $JACOCO_CLI_JAR"
+echo "DEBUG: Checking if $JACOCO_CLI_JAR exists..."
+
+# Check if JaCoCo CLI JAR exists in the cache directory
+if [ ! -f "$JACOCO_CLI_JAR" ]; then
+    echo "JaCoCo CLI JAR not found in cache directory. Downloading..."
+    mkdir -p "$JACOCO_DIR"
+    wget -q "https://github.com/jacoco/jacoco/releases/download/v$JACOCO_VERSION/jacoco-$JACOCO_VERSION.zip" -O "/tmp/jacoco-$JACOCO_VERSION.zip"
+    unzip -q "/tmp/jacoco-$JACOCO_VERSION.zip" -d "$JACOCO_DIR"
+    rm -f "/tmp/jacoco-$JACOCO_VERSION.zip"
+    echo "DEBUG: Downloaded JaCoCo CLI to $JACOCO_DIR"
+    ls -la "$JACOCO_DIR"
+else
+    echo "DEBUG: JaCoCo CLI JAR found at $JACOCO_CLI_JAR"
+fi
+
+# Check if JaCoCo CLI JAR exists after download
+if [ ! -f "$JACOCO_CLI_JAR" ]; then
+    echo "Error: JaCoCo CLI JAR not found at $JACOCO_CLI_JAR"
+    exit 1
+fi
+
+export JACOCO_CLI_JAR