From 558997576121229d7c8b2ef08e9b6694cfe38712 Mon Sep 17 00:00:00 2001 From: Beq Date: Mon, 16 Sep 2024 19:38:38 +0100 Subject: [PATCH] Use ubuntu not linux when referencing artifacts, add dupe check --- fsutils/build_config.json | 2 +- fsutils/download_list.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fsutils/build_config.json b/fsutils/build_config.json index 2785ca1ece..9ca79a8ffe 100644 --- a/fsutils/build_config.json +++ b/fsutils/build_config.json @@ -17,7 +17,7 @@ "os_hosted_folder": { "windows": "windows", "macos": "mac", - "linux": "linux" + "ubuntu": "linux" }, "platforms_printable": { "windows": "MS Windows", diff --git a/fsutils/download_list.py b/fsutils/download_list.py index 90128553fe..a8834acf13 100644 --- a/fsutils/download_list.py +++ b/fsutils/download_list.py @@ -227,8 +227,9 @@ def unpack_artifacts(path_to_artifacts_directory, config): "build_type_fullpath": build_type_dir, "os_folders": [], } - print(f"Appended {os_folder} to build_type {build_type}") - build_types_found[build_type]["os_folders"].append(os_folder) + if os_folder not in build_types_found[build_type]["os_folders"]: + build_types_found[build_type]["os_folders"].append(os_folder) + print(f"Appended {os_folder} to build_type {build_type}") print(f"Finished processing artifacts for build_type {build_type}") return build_types_found