Skip to content

Commit 21a9c5c

Browse files
committed
ci(arduino_cli): support version higher or equal to 0.19.0
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent c75515c commit 21a9c5c

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

CI/build/arduino-cli.py

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
arch = arch_default
6060
arduino_platform = arduino_platform_default
6161
arduino_cli = ""
62-
arduino_cli_default_version = "0.18.0"
63-
arduino_cli_version = arduino_cli_default_version
62+
arduino_cli_default_ver = "0.19.0"
63+
arduino_cli_ver = arduino_cli_default_ver
6464

6565
# List
6666
sketch_list = []
@@ -152,7 +152,7 @@ def create_config():
152152

153153
def check_config():
154154
global arduino_cli
155-
global arduino_cli_version
155+
global arduino_cli_ver
156156
global arduino_cli_path
157157
global sketches_path_list
158158
global search_path_list
@@ -205,13 +205,13 @@ def check_config():
205205
else:
206206
res = re.match(r".*Version:\s+(\d+\.\d+\.\d+).*", output.decode("utf-8"))
207207
if res:
208-
arduino_cli_version = res.group(1)
209-
print(f"Arduino CLI version used: {arduino_cli_version}")
210-
if version.parse(arduino_cli_version) <= version.parse("0.10.0"):
211-
print("Arduino CLI version <= 0.10.0 is no more supported")
208+
arduino_cli_ver = res.group(1)
209+
print(f"Arduino CLI version used: {arduino_cli_ver}")
210+
if version.parse(arduino_cli_ver) < version.parse(arduino_cli_default_ver):
211+
print(f"Arduino CLI version < {arduino_cli_default_ver} not supported")
212212
else:
213213
print("Unable to define Arduino CLI version.")
214-
print(f"Use default: {arduino_cli_default_version}")
214+
print(f"Use default: {arduino_cli_default_ver}")
215215

216216
if args.url:
217217
stm32_url = args.url
@@ -458,10 +458,6 @@ def find_board():
458458
if args.board:
459459
arg_board_pattern = re.compile(args.board, re.IGNORECASE)
460460

461-
if version.parse(arduino_cli_version) >= version.parse("0.18.0"):
462-
fqbn_key = "fqbn"
463-
else:
464-
fqbn_key = "FQBN"
465461
fqbn_list_tmp = []
466462
try:
467463
output = subprocess.check_output(
@@ -476,8 +472,8 @@ def find_board():
476472
boards_list = json.loads(output)
477473
if boards_list is not None:
478474
for board in boards_list["boards"]:
479-
if arduino_platform in board[fqbn_key]:
480-
fqbn_list_tmp.append(board[fqbn_key])
475+
if arduino_platform in board["fqbn"]:
476+
fqbn_list_tmp.append(board["fqbn"])
481477
if not len(fqbn_list_tmp):
482478
print(f"No boards found for {arduino_platform}")
483479
quit(1)

0 commit comments

Comments
 (0)