join uncovered lines and sort input before processing

Author: malaupa

coverage_summary.awk

@@ -20,10 +20,14 @@ BEGIN {
   file = ""
 }
 $1 !~ /mode:/ {
-  if (match($1,"^"package"([^:]+):([0-9]+).[0-9]+,([0-9]+).[0-9]+",f)) {
+  if (match($1,"^"package"(.+)$",f)) {
     if (file != "" && file != f[1] ) {
+      # write file entry with coverage and uncovered lines
       fileCoverage = fileCovered/fileStatements*100
       if (lineStart != "" && lineEnd != "") {
+        if (uncoveredLines != "") {
+          uncoveredLines = uncoveredLines", "
+        }
         uncoveredLines = sprintf("%s[%s-%s](%s%s#L%s-L%s)", uncoveredLines, lineStart, lineEnd, baseUrl, file,  lineStart, lineEnd)
       }
       details = sprintf("%s|%s %.1f%|%s|%s|\n", details, bar(fileCoverage), fileCoverage, file, uncoveredLines)
@@ -32,27 +36,32 @@ $1 !~ /mode:/ {
       uncoveredLines = ""
       lineStart = ""
       lineEnd = ""
-    } 
+    }
+    # start new file coverage measuring
     file = f[1]
-    statements += $2
-    fileStatements += $2
-    if ($3 != "0") {
-      covered += $2
-      fileCovered += $2
+    statements += $4
+    fileStatements += $4
+    if ($5 != "0") {
+      # covered lines
+      covered += $4
+      fileCovered += $4
+
+      if (lineStart != "" && lineEnd != "") {
+        if (uncoveredLines != "") {
+          uncoveredLines = uncoveredLines", "
+        }
+        uncoveredLines = sprintf("%s[%s-%s](%s%s#L%s-L%s)", uncoveredLines, lineStart, lineEnd, baseUrl, file,  lineStart, lineEnd)
+        lineStart = ""
+        lineEnd = ""
+      }
+
       next
     } 
-    if (lineStart == "" && lineEnd == "") {
-      lineStart = f[2]
-      lineEnd = f[3]
-      next
+    # not covered lines
+    if (lineStart == "") {
+      lineStart = $2
     }
-    if (lineEnd+0 == f[2]+0 || lineEnd+1 == f[2]+0) {
-      lineEnd = f[3]
-      next
-    } 
-    uncoveredLines = sprintf("%s[%s-%s](%s%s#L%s-L%s), ", uncoveredLines, lineStart, lineEnd, baseUrl, file,  lineStart, lineEnd)
-    lineStart = f[2]
-    lineEnd = f[3]
+    lineEnd = $3
   }
 }
 END {

summary.sh

@@ -14,7 +14,7 @@ fi
 if [[ -f "$GITHUB_WORKSPACE/$COVERAGE_PROFILE" ]] ; then
   echo "process coverage profile"
   PACKAGE=$(awk '$1 ~ /module/ { print $2 }' $GITHUB_WORKSPACE/go.mod)
-  awk -f $SCRIPT_DIR/coverage_summary.awk -v package="$PACKAGE" -v baseUrl="$BASE_URL" $GITHUB_WORKSPACE/$COVERAGE_PROFILE >> $SUMMARY_FILE
+  awk '{ gsub(/(\.[0-9]+,|\.[0-9]+ |:)/," "); print }' $GITHUB_WORKSPACE/$COVERAGE_PROFILE | sort -k1,1 -k2,2n | awk -f $SCRIPT_DIR/coverage_summary.awk -v package="$PACKAGE" -v baseUrl="$BASE_URL" >> $SUMMARY_FILE
 fi
 
 if [[ "$WITH_ARCHIVE" == "true" && -f "$GITHUB_WORKSPACE/$COVERAGE_PROFILE" ]] ; then