Skip to content

Commit 1f918d8

Browse files
committed
[CI] Fix arduino-cli changes
New arduino-cli 0.18.0 is not backward compatible. Json format case issue. Signed-off-by: Frederic Pillon <[email protected]>
1 parent 296707d commit 1f918d8

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

CI/build/arduino-cli.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
arch = arch_default
5454
arduino_platform = arduino_platform_default
5555
arduino_cli = ""
56-
arduino_cli_default_version = "0.10.0"
56+
arduino_cli_default_version = "0.17.0"
5757
arduino_cli_version = arduino_cli_default_version
5858

5959
# List
@@ -462,6 +462,10 @@ def find_board():
462462
if args.board:
463463
arg_board_pattern = re.compile(args.board, re.IGNORECASE)
464464

465+
if version.parse(arduino_cli_version) >= version.parse("0.18.0"):
466+
fqbn_key = "fqbn"
467+
else:
468+
fqbn_key = "FQBN"
465469
fqbn_list_tmp = []
466470
try:
467471
output = subprocess.check_output(
@@ -476,8 +480,8 @@ def find_board():
476480
boards_list = json.loads(output)
477481
if boards_list is not None:
478482
for board in boards_list["boards"]:
479-
if arduino_platform in board["FQBN"]:
480-
fqbn_list_tmp.append(board["FQBN"])
483+
if arduino_platform in board[fqbn_key]:
484+
fqbn_list_tmp.append(board[fqbn_key])
481485
if not len(fqbn_list_tmp):
482486
print("No boards found for " + arduino_platform)
483487
quit(1)
@@ -711,7 +715,7 @@ def genBasicCommand(b_name):
711715
cmd.append(build_output_cache_dir)
712716
if args.verbose:
713717
cmd.append("--verbose")
714-
if version.parse(arduino_cli_version) <= version.parse(arduino_cli_default_version):
718+
if version.parse(arduino_cli_version) <= version.parse("0.10.0"):
715719
cmd.append("--output")
716720
cmd.append(os.path.join(output_dir, b_name, bin_dir, "dummy_sketch"))
717721
else:

0 commit comments

Comments
 (0)