diff --git a/.gitignore b/.gitignore index b6e8979..820feb2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ fedora.icns installer_data.json merged_installer_data.json fedora-*.zip +fedora-*.raw.zst +fedora-*.json diff --git a/builder.py b/builder.py index 250e8ab..9ed3dd1 100755 --- a/builder.py +++ b/builder.py @@ -149,10 +149,12 @@ def packageUpload(target): package = f"{base}.zip" logs_package = f"{base}-logs.zip" image = f"{base}.raw.zstd" + manifest = f"{base}.json" uploadToS3(package, f"os/{package}") uploadToS3(logs_package, f"os/{logs_package}") uploadToS3(image, f"os/{image}") + uploadToS3(manifest, f"os/{manifest}") def getManifest(): diff --git a/make-asahi-installer-package.sh b/make-asahi-installer-package.sh index 2da4ffd..ded74f2 100755 --- a/make-asahi-installer-package.sh +++ b/make-asahi-installer-package.sh @@ -65,44 +65,48 @@ pushd "${workdir}/package" > /dev/null 7z a -tzip -r "${basedir}/${package}" . popd > /dev/null +cat > "${package}.json" < installer_data.json <