step

Author: pillo79

extra/ci_collect_logs.sh

@@ -12,17 +12,26 @@ if [ -z "$ALL_BOARD_DATA" ] || [ -z "$GITHUB_REPOSITORY" ] || [ -z "$GITHUB_RUN_
 	exit 0
 fi
 
+artifact_count() {
+	COUNT=$1
+	ICON=$2
+	if [ $COUNT -eq 0 ] ; then
+		ICON=":new_moon:"
+	fi
+	printf "<code>%3i</code>%s" $COUNT $ICON
+}
+
 artifact_entry() {
-	ICON="$1"
-	TEXT="$2"
-	LINK="$3"
+	TEXT="$1"
+	LINK="$2"
 
 	if [ -z "$LINK" ] ; then
 		BOARD_LINK="$BOARD"
 	else
 		BOARD_LINK="<a href=\"$LINK\">$BOARD</a>"
 	fi
-	echo -e "<li><details><summary>$ICON $BOARD_LINK (<code>$VARIANT</code>) - $TEXT</summary>$DETAILS</details></li>"
+	COUNTS="<b>$(artifact_count $SKETCH_ERRORS ":red_circle:") $(artifact_count $SKETCH_WARNINGS ":yellow_circle:")</b> $(artifact_count $((SKETCH_COUNT - SKETCH_ERRORS - SKETCH_WARNINGS)) ":green_circle:")"
+	echo -e "<li><details><summary>$TITLE $BOARD_LINK (<code>$VARIANT</code>) $TEXT</summary><table>$DETAILS</table></details></li>"
 }
 
 details_line() {
@@ -31,17 +40,19 @@ details_line() {
 	if echo "$SKETCH_NAME" | grep -qE 'libraries/' ; then
 		LIB=$(echo "$SKETCH_NAME" | sed -e 's/.*libraries\///' -e 's/\/.*//')
 		SKETCH=$(echo "$SKETCH_NAME" | sed -e 's/.*libraries\/[^/]*\///')
-		SUMMARY="$ICON <code>$LIB</code> <code>$SKETCH</code> : $TEXT"
+		SUMMARY="<code>$LIB</code> <code>$SKETCH</code>"
 	else
-		SUMMARY="$ICON <code>$SKETCH_NAME</code> : $TEXT"
+		SUMMARY="<code>$SKETCH_NAME</code>"
 	fi
 	if [ $SKETCH_ISSUES_COUNT -ne 0 ] ; then
+		SUMMARY="$SUMMARY :down:"
 		ICON="$SKETCH_ISSUES_COUNT $ICON"
 		BODY="\n\n\`\`\`\n${SKETCH_ISSUES}\n\`\`\`\n"
 	else
+		SUMMARY="$SUMMARY :white_check_mark:"
 		BODY=""
 	fi
-	echo -e "<tr><td>$ICON</td><td><details><summary>$SUMMARY</summary>$BODY</details></td></tr>"
+	echo -e "<tr><td align=right>$ICON</td><td><details><summary>$SUMMARY</summary>$BODY</details></td></tr>"
 }
 
 ARTIFACTS=$(jq -cr 'map(.artifact) | unique | .[]' <<< ${ALL_BOARD_DATA}) # this avoids the 'zephyr' artifact
@@ -54,7 +65,7 @@ for artifact in $ARTIFACTS ; do
 		FQBN="arduino:$SUBARCH:$BOARD"
 		REPORT_FILE="$(echo $FQBN | tr ':' '-').json"
 
-		DETAILS="<table><tr><th>Status</th><th>Sketch</th></tr>"
+		DETAILS=""
 		ARTIFACT_LINK=""
 		if [ ! -f $REPORT_FILE ]; then
 			ARTIFACT_STATUS="fire"
@@ -85,20 +96,19 @@ for artifact in $ARTIFACTS ; do
 				fi
 			done
 		fi
-		DETAILS="${DETAILS}</table>"
 
 		case $ARTIFACT_STATUS in
 			success)
-				artifact_entry ":white_check_mark:" "All $SKETCH_COUNT sketches built successfully"
+				artifact_entry "PASS :white_check_mark:"
 				;;
 			warning)
-				artifact_entry ":exclamation:" "All $SKETCH_COUNT sketches built ($SKETCH_WARNINGS with warnings)" "$ARTIFACT_LINK"
+				artifact_entry "<b>WARNING</> :exclamation:" "$ARTIFACT_LINK"
 				;;
 			error)
-				artifact_entry ":x:" "$SKETCH_ERRORS out of $SKETCH_COUNT sketches failed to build" "$ARTIFACT_LINK"
+				artifact_entry "<b>FAILURE</b> :x:" "$ARTIFACT_LINK"
 				;;
 			*)
-				artifact_entry ":fire:" "Report file missing or unreadable"
+				artifact_entry "<b>CI ISSUE</b> :fire:"
 				;;
 		esac
 	done