Fix CI wrt code coverage

cowtowncoder · cowtowncoder · commit 2ab6b5f6c25d · 2025-12-11T15:22:44.000-08:00
diff --git a/.github/workflows/coverage-comment.yml b/.github/workflows/coverage-comment.yml
@@ -0,0 +1,39 @@
+name: Post Coverage Comment
+on:
+  workflow_run:
+    workflows: ["Build and Deploy Snapshot"]
+    types: [completed]
+
+permissions:
+  pull-requests: write
+
+jobs:
+  comment:
+    runs-on: ubuntu-24.04
+    if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
+    steps:
+    - name: Download comment artifact
+      uses: dawidd6/action-download-artifact@v6
+      with:
+        name: pr-comment
+        path: pr-comment/
+        run_id: ${{ github.event.workflow_run.id }}
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Post coverage comment
+      run: |
+        PR_NUMBER=$(cat pr-comment/pr-number.txt)
+        COMMENT_BODY=$(cat pr-comment/comment-body.txt)
+
+        # Find and delete existing comment
+        COMMENT_ID=$(gh pr view $PR_NUMBER --json comments \
+          --jq '.comments[] | select(.body | contains("<!-- jacoco-coverage-comment -->")) | .id' | head -1)
+
+        if [ -n "$COMMENT_ID" ]; then
+          gh api -X DELETE "repos/${{ github.repository }}/issues/comments/$COMMENT_ID" || true
+        fi
+
+        # Post new comment
+        gh pr comment $PR_NUMBER --body "$COMMENT_BODY"
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,7 +11,6 @@ on:
     - "release-notes/*"
 permissions:
   contents: read
-  pull-requests: write
 
 jobs:
   build:
@@ -107,72 +106,62 @@ jobs:
         generate-coverage-badge: false
         generate-branches-badge: false
         generate-summary: true
-    - name: Add coverage comment to PR
+    - name: Generate coverage comment
       if: ${{ matrix.release_build && github.event_name == 'pull_request' }}
       run: |
+        # Helper functions
+        parse_coverage() {
+          local csv_file=$1 col_missed=$2 col_covered=$3
+          awk -F',' -v m="$col_missed" -v c="$col_covered" \
+            'NR>1 && $1=="Jackson-core" {
+              missed=$m; covered=$c;
+              if (missed + covered > 0) printf "%.1f", (covered * 100.0) / (missed + covered)
+            }' "$csv_file" | head -1
+        }
+
+        format_delta() {
+          local delta=$1
+          if awk -v d="$delta" 'BEGIN { exit (d >= 0) ? 0 : 1 }'; then
+            echo "+${delta}%|📈"
+          else
+            echo "${delta}%|📉"
+          fi
+        }
+
+        get_color() {
+          awk -v v="$1" 'BEGIN {
+            if (v >= 80) print "brightgreen"
+            else if (v >= 60) print "green"
+            else if (v >= 40) print "yellow"
+            else print "red"
+          }'
+        }
+
         # Convert decimal to percentage and round to 1 decimal place
         COVERAGE=$(awk -v cov="${{ steps.jacoco.outputs.coverage }}" 'BEGIN { printf "%.1f", cov * 100 }')
         BRANCHES=$(awk -v br="${{ steps.jacoco.outputs.branches }}" 'BEGIN { printf "%.1f", br * 100 }')
 
-        # Check if base coverage artifact was downloaded
+        # Check if base coverage artifact was downloaded and calculate deltas
+        HAS_DELTA=false
         if [ -f "base-coverage/jacoco.csv" ]; then
           echo "Found base branch coverage from artifact"
-          BASE_CSV="base-coverage/jacoco.csv"
-
-          # Parse base branch coverage
-          BASE_COVERAGE=$(awk -F',' 'NR>1 && $1=="Jackson-core" {
-            missed=$4; covered=$5;
-            if (missed + covered > 0) printf "%.1f", (covered * 100.0) / (missed + covered)
-          }' "$BASE_CSV" | head -1)
-          BASE_BRANCHES=$(awk -F',' 'NR>1 && $1=="Jackson-core" {
-            missed=$6; covered=$7;
-            if (missed + covered > 0) printf "%.1f", (covered * 100.0) / (missed + covered)
-          }' "$BASE_CSV" | head -1)
+          BASE_COVERAGE=$(parse_coverage "base-coverage/jacoco.csv" 4 5)
+          BASE_BRANCHES=$(parse_coverage "base-coverage/jacoco.csv" 6 7)
 
           if [ -n "$BASE_COVERAGE" ] && [ -n "$BASE_BRANCHES" ]; then
-            # Calculate deltas
             COV_DELTA=$(awk -v curr="$COVERAGE" -v base="$BASE_COVERAGE" 'BEGIN { printf "%.1f", curr - base }')
             BR_DELTA=$(awk -v curr="$BRANCHES" -v base="$BASE_BRANCHES" 'BEGIN { printf "%.1f", curr - base }')
 
-            # Format delta strings with + or - signs
-            if awk -v delta="$COV_DELTA" 'BEGIN { exit (delta >= 0) ? 0 : 1 }'; then
-              COV_DELTA_STR="+${COV_DELTA}%"
-              COV_DELTA_EMOJI="📈"
-            else
-              COV_DELTA_STR="${COV_DELTA}%"
-              COV_DELTA_EMOJI="📉"
-            fi
-
-            if awk -v delta="$BR_DELTA" 'BEGIN { exit (delta >= 0) ? 0 : 1 }'; then
-              BR_DELTA_STR="+${BR_DELTA}%"
-              BR_DELTA_EMOJI="📈"
-            else
-              BR_DELTA_STR="${BR_DELTA}%"
-              BR_DELTA_EMOJI="📉"
-            fi
+            IFS='|' read -r COV_DELTA_STR COV_DELTA_EMOJI <<< "$(format_delta "$COV_DELTA")"
+            IFS='|' read -r BR_DELTA_STR BR_DELTA_EMOJI <<< "$(format_delta "$BR_DELTA")"
 
             HAS_DELTA=true
-          else
-            HAS_DELTA=false
           fi
-        else
-          HAS_DELTA=false
         fi
 
-        # Determine color for coverage badge using awk (more portable than bc)
-        COV_COLOR=$(awk -v cov="$COVERAGE" 'BEGIN {
-          if (cov >= 80) print "brightgreen"
-          else if (cov >= 60) print "green"
-          else if (cov >= 40) print "yellow"
-          else print "red"
-        }')
-
-        BR_COLOR=$(awk -v br="$BRANCHES" 'BEGIN {
-          if (br >= 80) print "brightgreen"
-          else if (br >= 60) print "green"
-          else if (br >= 40) print "yellow"
-          else print "red"
-        }')
+        # Determine badge colors
+        COV_COLOR=$(get_color "$COVERAGE")
+        BR_COLOR=$(get_color "$BRANCHES")
 
         # Build coverage table with or without deltas
         if [ "$HAS_DELTA" = "true" ]; then
@@ -195,17 +184,17 @@ jobs:
 
         <!-- jacoco-coverage-comment -->"
 
-        # Find and delete existing coverage comment
-        COMMENT_ID=$(gh pr view ${{ github.event.pull_request.number }} --json comments --jq '.comments[] | select(.body | contains("<!-- jacoco-coverage-comment -->")) | .id' | head -1) || true
-
-        if [ -n "$COMMENT_ID" ]; then
-          gh api -X DELETE "repos/${{ github.repository }}/issues/comments/$COMMENT_ID" || true
-        fi
-
-        # Post new comment
-        gh pr comment ${{ github.event.pull_request.number }} --body "$COMMENT_BODY"
-      env:
-        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        # Save comment for the workflow_run
+        mkdir -p pr-comment
+        echo "${{ github.event.pull_request.number }}" > pr-comment/pr-number.txt
+        echo "$COMMENT_BODY" > pr-comment/comment-body.txt
+    - name: Upload PR comment
+      if: ${{ matrix.release_build && github.event_name == 'pull_request' }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: pr-comment
+        path: pr-comment/
+        retention-days: 1
 
   trigger-dep-builds-v2:
     name: Trigger downstream builds for v2
