thefossguy/asahi-kiwi-descriptions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builder: Always consistently identify Fedora variants

Browse Source 
This eliminates the "variant-less" version of the images and
correctly labels all variants properly.
This commit is contained in:
Neal Gompa 2023-05-09 07:48:36 -04:00
parent 34a4ef3ca5
commit 0d1538e7ca
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builder.py
View File

@ -26,12 +26,12 @@ if not RELEASE:
TARGETS = { TARGETS = {
"gnome": { "gnome": {
"profile": "Workstation-GNOME", "profile": "Workstation-GNOME",
"name": f"Fedora Linux {RELEASE}", "name": f"Fedora Linux {RELEASE} Workstation (GNOME)",
"id": "gnome", "id": "gnome",
}, },
"kde": { "kde": {
"profile": "Workstation-KDE", "profile": "Workstation-KDE",
"name": f"Fedora Linux {RELEASE} with KDE", "name": f"Fedora Linux {RELEASE} KDE Plasma Desktop",
"id": "kde", "id": "kde",
}, },
"server": { "server": {
@ -116,11 +116,8 @@ def packageBuild(target):
runCommand(["./make-asahi-installer-package.sh"]) runCommand(["./make-asahi-installer-package.sh"])
today = date.today().strftime("%Y%m%d") today = date.today().strftime("%Y%m%d")
if target["id"] == "gnome": package = f"fedora-{RELEASE}-{target['id']}-{today}.zip"
package = f"fedora-{RELEASE}-{today}.zip" os.rename(f"fedora-{RELEASE}-{today}.zip", package)
else:
package = f"fedora-{RELEASE}-{target['id']}-{today}.zip"
os.rename(f"fedora-{RELEASE}-{today}.zip", package)
with open("installer_data.json", "r") as f: with open("installer_data.json", "r") as f:
data = json.load(f) data = json.load(f)
@ -152,10 +149,7 @@ def invalidateCF(path):
def packageUpload(target): def packageUpload(target):
today = date.today().strftime("%Y%m%d") today = date.today().strftime("%Y%m%d")
if target["id"] == "gnome": package = f"fedora-{RELEASE}-{target['id']}-{today}.zip"
package = f"fedora-{RELEASE}-{today}.zip"
else:
package = f"fedora-{RELEASE}-{target['id']}-{today}.zip"
uploadToS3(package, f"os/{package}") uploadToS3(package, f"os/{package}")