From cdf0a1f24ac5336f5b4031264445363da9396af6 Mon Sep 17 00:00:00 2001
From: Davide Cavalca <dcavalca@fedoraproject.org>
Date: Wed, 19 Jul 2023 17:39:31 -0700
Subject: [PATCH] Package up the logs and the raw image too

---
 builder.py                      |  7 ++++++-
 make-asahi-installer-package.sh | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/builder.py b/builder.py
index fc2bfd4..250e8ab 100755
--- a/builder.py
+++ b/builder.py
@@ -145,9 +145,14 @@ def uploadToS3(source, destination):
 
 
 def packageUpload(target):
-    package = f"fedora-{RELEASE}-{target['id']}-{TODAY}.zip"
+    base = f"fedora-{RELEASE}-{target['id']}-{TODAY}"
+    package = f"{base}.zip"
+    logs_package = f"{base}-logs.zip"
+    image = f"{base}.raw.zstd"
 
     uploadToS3(package, f"os/{package}")
+    uploadToS3(logs_package, f"os/{logs_package}")
+    uploadToS3(image, f"os/{image}")
 
 
 def getManifest():
diff --git a/make-asahi-installer-package.sh b/make-asahi-installer-package.sh
index b4142fd..2da4ffd 100755
--- a/make-asahi-installer-package.sh
+++ b/make-asahi-installer-package.sh
@@ -105,3 +105,18 @@ cat > installer_data.json <<EOF
     ]
 }
 EOF
+
+# Package up the logs
+mkdir -p "${workdir}/logs"
+cp -p \
+  outdir/build/image-root.log \
+  outdir/Fedora-Asahi-Remix.aarch64-0.0.0.changes \
+  outdir/Fedora-Asahi-Remix.aarch64-0.0.0.packages \
+  outdir/kiwi.result.json \
+  "${workdir}/logs/"
+pushd "${workdir}/logs" > /dev/null
+7z a -tzip -r "${basedir}/${package}-logs" .
+popd > /dev/null
+
+# Package up the raw image
+zstd -c9 < "${image}" > "${basedir}/${package}.raw.zst"