Skip to content

Commit ab9ef6e

Browse files
committed
ci(arduino_cli): remove skipped from the log and stats
Only display the number of skipped build. Signed-off-by: Frederic Pillon <[email protected]>
1 parent 52533b3 commit ab9ef6e

File tree

1 file changed

+7
-20
lines changed

1 file changed

+7
-20
lines changed

CI/build/arduino-cli.py

+7-20
Original file line numberDiff line numberDiff line change
@@ -639,10 +639,9 @@ def log_sketch_build_result(sketch, boardKo, boardSkipped):
639639
# Log final result
640640
def log_final_result():
641641
# Also equal to len(board_fqbn) * len(sketch_list)
642-
nb_build_total = nb_build_passed + nb_build_failed + nb_build_skipped
642+
nb_build_total = nb_build_passed + nb_build_failed
643643
stat_passed = round(nb_build_passed * 100.0 / nb_build_total, 2)
644644
stat_failed = round(nb_build_failed * 100.0 / nb_build_total, 2)
645-
stat_skipped = round(nb_build_skipped * 100.0 / nb_build_total, 2)
646645
duration = str(timedelta(seconds=time.time() - full_buildTime))
647646

648647
# Log file
@@ -652,8 +651,8 @@ def log_final_result():
652651
f.write(build_separator + "\n")
653652
ssucc = f"{nb_build_passed} succeeded ({stat_passed}%)"
654653
sfail = f"{nb_build_failed} failed ({stat_failed}%)"
655-
sskip = f"{nb_build_skipped} skipped ({stat_skipped}%)"
656-
f.write(f"{ssucc}, {sfail}, {sskip} of {nb_build_total} builds\n")
654+
sskip = f"{nb_build_skipped} skipped)"
655+
f.write(f"{ssucc}, {sfail} of {nb_build_total} builds ({sskip})\n")
657656
f.write(f"Ends {time.strftime('%A %d %B %Y %H:%M:%S')}\n")
658657
f.write(f"Duration: {duration}\n")
659658
f.write(f"Logs are available here:\n{output_dir}\n")
@@ -662,8 +661,8 @@ def log_final_result():
662661
# Standard output
663662
ssucc = f"{nb_build_passed} {fsucc} ({stat_passed}%)"
664663
sfail = f"{nb_build_failed} {ffail} ({stat_failed}%)"
665-
sskip = f"{nb_build_skipped} {fskip} ({stat_skipped}%)"
666-
print(f"Builds Summary: {ssucc}, {sfail}, {sskip} of {nb_build_total} builds")
664+
sskip = f"{nb_build_skipped} {fskip}"
665+
print(f"Builds Summary: {ssucc}, {sfail} of {nb_build_total} builds ({sskip})")
667666
print(f"Duration: {duration}")
668667
print("Logs are available here:")
669668
print(output_dir)
@@ -675,7 +674,7 @@ def get_fqbn(b_name):
675674
return board_custom_fqbn[b_name]
676675
else:
677676
if b_name in board_options and board_options[b_name]:
678-
return board_fqbn[b_name] + "," + board_options[b_name]
677+
return f"{board_fqbn[b_name]},{board_options[b_name]}"
679678
else:
680679
return board_fqbn[b_name]
681680

@@ -727,17 +726,6 @@ def build_config(sketch, boardSkipped):
727726
if build_conf_list[idx][0] in na_sketch_pattern:
728727
for pattern in na_sketch_pattern[build_conf_list[idx][0]]:
729728
if re.search(pattern, str(sketch), re.IGNORECASE):
730-
print(
731-
(build_format_result).format(
732-
"{}/{}".format(
733-
build_conf_list[idx][1], build_conf_list[idx][2]
734-
),
735-
build_conf_list[idx][0],
736-
fskip,
737-
0.00,
738-
)
739-
)
740-
741729
boardSkipped.append(build_conf_list[idx][0])
742730
del build_conf_list[idx]
743731
nb_build_skipped += 1
@@ -770,8 +758,7 @@ def build_all():
770758
for sketch_nb, sketch in enumerate(sketch_list, start=1):
771759
boardKo = []
772760
boardSkipped = []
773-
print("\n")
774-
print(build_separator)
761+
print(f"\n{build_separator}")
775762
print(
776763
"| {:^85} |".format(
777764
f"Sketch \033[34m{sketch.name}\033[0m ({sketch_nb}/{len(sketch_list)})"

0 commit comments

Comments
 (0)