Skip to content

Commit 080fdc7

Browse files
committed
[CI] Fix build config issue
gen_build_conf_list was modified inside build_config as paste by reference. This means any option added to fqbn was kept for next build. Example if USB was enabled then it was enabled for all following build. Signed-off-by: Frederic.Pillon <[email protected]>
1 parent 5fb9b2d commit 080fdc7

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Diff for: CI/build/arduino-builder.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -619,9 +619,10 @@ def create_build_conf_list():
619619
return build_conf_list
620620

621621

622-
def build_config(gen_build_conf_list, sketch, boardSkipped):
622+
def build_config(sketch, boardSkipped):
623623
global nb_build_skipped
624-
build_conf_list = list(gen_build_conf_list)
624+
build_conf_list = create_build_conf_list()
625+
625626
for idx in reversed(range(len(build_conf_list))):
626627
build_conf_list[idx][4][-1] = sketch
627628
if na_sketch_pattern:
@@ -642,6 +643,7 @@ def build_config(gen_build_conf_list, sketch, boardSkipped):
642643
else:
643644
# get specific sketch options to append to the fqbn
644645
for pattern in sketch_options:
646+
print
645647
if pattern in sketch_options:
646648
if re.search(pattern, sketch, re.IGNORECASE):
647649
if build_conf_list[idx][4][-2].count(":") == 3:
@@ -658,14 +660,12 @@ def build_config(gen_build_conf_list, sketch, boardSkipped):
658660
# Automatic run
659661
def build_all():
660662
create_output_log_tree()
661-
gen_build_conf_list = create_build_conf_list()
662663

663664
for sketch_nb, sketch in enumerate(sketch_list, start=1):
664665
boardKo = []
665666
boardSkipped = []
666667
print("\nBuilding : {} ({}/{}) ".format(sketch, sketch_nb, len(sketch_list)))
667-
build_conf_list = build_config(gen_build_conf_list, sketch, boardSkipped)
668-
668+
build_conf_list = build_config(sketch, boardSkipped)
669669
with concurrent.futures.ProcessPoolExecutor() as executor:
670670
for build_conf, res in zip(
671671
build_conf_list, executor.map(build, build_conf_list)

0 commit comments

Comments
 (0)