From 8031b9236dd1d2a9dd2abd6054d3da67637ba267 Mon Sep 17 00:00:00 2001 From: Florian Asche Date: Sat, 21 Nov 2026 07:26:41 +0100 Subject: [PATCH] ci(imager): group imager entries into stable, other versions, development and branches Co-Authored-By: Claude Sonnet 5.5 --- scripts/generate-imager-json.py | 44 ++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/scripts/generate-imager-json.py b/scripts/generate-imager-json.py index 2d3c2ff..0e0e29d 100755 --- a/scripts/generate-imager-json.py +++ b/scripts/generate-imager-json.py @@ -78,6 +78,11 @@ def extract_image_files(release): return xz_files +def is_version_tag(tag): + """Check whether a tag is a release version like v1.2.3 or 1.2.3.""" + return re.fullmatch(r'v?\d+\.\d+\.\d+', tag) is not None + + def get_releases_with_files(releases): """Get all releases that have image files, excluding 'main' branch.""" releases_with_files = [] @@ -310,6 +315,24 @@ def get_main_release(releases): return None +def build_release_group(name, description, releases): + """Build an os_list entry with one subitem per release.""" + return { + "name": name, + "description": description, + "icon": "icons/cat_raspberry_pi_os.png", + "subitems": [ + { + "name": r['version'], + "description": f"PiCompose {r['tag_name']} release", + "icon": "icons/cat_raspberry_pi_os.png", + "subitems": build_date_hardware_subitems(r['files']) + } + for r in releases + ] + } + + def build_devices_list(): """Build the devices list for rpi-imager.""" return [ @@ -343,6 +366,10 @@ def main(): "subitems": build_date_hardware_subitems(latest_files) }) + other_versions = [r for r in releases_with_files if is_version_tag(r['tag_name']) and r['tag_name'] != latest_tag] + if other_versions: + os_list.append(build_release_group("PiCompose - other versions", "Older tagged versions", other_versions)) + if main_release: os_list.append({ "name": "PiCompose - development", @@ -351,20 +378,9 @@ def main(): "subitems": build_date_hardware_subitems(main_release) }) - os_list.append({ - "name": "PiCompose - all versions / branches", - "description": "All available PiCompose versions", - "icon": "icons/cat_raspberry_pi_os.png", - "subitems": [ - { - "name": r['version'], - "description": f"PiCompose {r['tag_name']} release", - "icon": "icons/cat_raspberry_pi_os.png", - "subitems": build_date_hardware_subitems(r['files']) - } - for r in releases_with_files - ] - }) + branches = [r for r in releases_with_files if not is_version_tag(r['tag_name'])] + if branches: + os_list.append(build_release_group("PiCompose - branches", "Test builds of branches", branches)) final_data = { "imager": {