From 0d1538e7ca5d7999a89ab5d4a1e2b4dab0369be5 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 9 May 2023 07:48:36 -0400 Subject: [PATCH] builder: Always consistently identify Fedora variants This eliminates the "variant-less" version of the images and correctly labels all variants properly. --- builder.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/builder.py b/builder.py index 15ef2d0..2d5487f 100755 --- a/builder.py +++ b/builder.py @@ -26,12 +26,12 @@ if not RELEASE: TARGETS = { "gnome": { "profile": "Workstation-GNOME", - "name": f"Fedora Linux {RELEASE}", + "name": f"Fedora Linux {RELEASE} Workstation (GNOME)", "id": "gnome", }, "kde": { "profile": "Workstation-KDE", - "name": f"Fedora Linux {RELEASE} with KDE", + "name": f"Fedora Linux {RELEASE} KDE Plasma Desktop", "id": "kde", }, "server": { @@ -116,11 +116,8 @@ def packageBuild(target): runCommand(["./make-asahi-installer-package.sh"]) today = date.today().strftime("%Y%m%d") - if target["id"] == "gnome": - package = f"fedora-{RELEASE}-{today}.zip" - else: - package = f"fedora-{RELEASE}-{target['id']}-{today}.zip" - os.rename(f"fedora-{RELEASE}-{today}.zip", package) + package = f"fedora-{RELEASE}-{target['id']}-{today}.zip" + os.rename(f"fedora-{RELEASE}-{today}.zip", package) with open("installer_data.json", "r") as f: data = json.load(f) @@ -152,10 +149,7 @@ def invalidateCF(path): def packageUpload(target): today = date.today().strftime("%Y%m%d") - if target["id"] == "gnome": - package = f"fedora-{RELEASE}-{today}.zip" - else: - package = f"fedora-{RELEASE}-{target['id']}-{today}.zip" + package = f"fedora-{RELEASE}-{target['id']}-{today}.zip" uploadToS3(package, f"os/{package}")