step

Author: pillo79

extra/ci_collect_logs.sh

@@ -22,15 +22,19 @@ artifact_entry() {
 	else
 		BOARD_LINK="<a href=\"$LINK\">$BOARD</a>"
 	fi
-	echo -n "<li><details><summary>$ICON $BOARD_LINK (\`$VARIANT\`) - $TEXT</summary>"
-	echo -ne "\n\n$DETAILS"
-	echo "</details></li>"
+	echo -ne "<li><details><summary>\n\n$ICON $BOARD_LINK (\`$VARIANT\`) - $TEXT</summary>\n\n$DETAILS\n</details></li>"
 }
 
 details_line() {
 	ICON="$1"
-	TEXT="$2"
-	echo "$ICON \`$SKETCH_NAME\`: $TEXT"
+	TEXT="$2" 
+	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\/[^/]*\///')
+		echo "$ICON \`$LIB\` \`$SKETCH\`: $TEXT"
+	else
+		echo "$ICON \`$SKETCH_NAME\`: $TEXT"
+	fi
 }
 
 ARTIFACTS=$(jq -cr 'map(.artifact) | unique | .[]' <<< ${ALL_BOARD_DATA}) # this avoids the 'zephyr' artifact
@@ -58,7 +62,7 @@ for artifact in $ARTIFACTS ; do
 			ARTIFACT_STATUS=success
 			for i in $(seq 0 $((SKETCH_COUNT - 1))) ; do
 				REPORT=$(echo $REPORTS | jq -cr ".[$i]")
-				SKETCH_NAME=$(echo $REPORT | jq -cr '.name' | sed -e 's/.*libraries//' -e 's/examples\///')
+				SKETCH_NAME=$(echo $REPORT | jq -cr '.name')
 				if ! $(echo $REPORT | jq -cr '.compilation_success') ; then
 					SKETCH_ERRORS=$((SKETCH_ERRORS + 1))
 					ARTIFACT_STATUS=error
@@ -91,5 +95,5 @@ for artifact in $ARTIFACTS ; do
 				;;
 		esac
 	done
-	echo "</ul>"
+	echo -e "</ul>\n"
 done