From 226df37ae4b98866f5e6d47ec9f1bd2f4fed5352 Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Wed, 19 Aug 2026 07:57:34 -0700
Subject: [PATCH 1/3] folder structure

---
 .github/workflows/release.yaml | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 9bce226a2..15c16b513 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -39,11 +39,11 @@ jobs:
 
       - name: Compress (xz) usr partition
         run: |
-          find mkosi.output/sysupdate -maxdepth 1 -type f -name "*.usr-*.raw" ! -name "*verity*" -exec xz -7v -T0 {} +
+          find mkosi.output -maxdepth 1 -type f -name "*.usr-*.raw" ! -name "*verity*" -exec xz -7v -T0 {} +
 
       - name: Generate SHA256SUMS (all partitions)
         run: |
-          cd mkosi.output/sysupdate
+          cd mkosi.output
           sha256sum *.esp.raw \
               *.usr-*.*.raw.xz \
               *.usr-*-verity.*.raw \
@@ -55,7 +55,7 @@ jobs:
         id: get_date
         run: |
           set -euo pipefail
-          FILE_PATH=$(ls mkosi.output/sysupdate/*.usr-*.raw.xz | head -n 1)
+          FILE_PATH=$(ls mkosi.output/*.usr-*.raw.xz | head -n 1)
           TIMESTAMP=$(basename "$FILE_PATH" | grep -oE '[0-9]{8}' | head -n 1 || true)
           if [ -z "$TIMESTAMP" ]; then
             echo "No date found in $(basename "$FILE_PATH"), falling back to build date."
@@ -74,24 +74,28 @@ jobs:
           set -euo pipefail
 
           # 1. Images
-          aws s3 sync mkosi.output/sysupdate/ "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/$ARCH/" \
-            --exclude "*" \
-            --include "*.esp.raw" \
-            --include "*.usr-*.*.raw.xz" \
-            --include "*.usr-*-verity.*.raw" \
-            --include "*.usr-*-verity-sig.*.raw" \
-            --cache-control "public, max-age=31536000, immutable"
+          cd mkosi.output
+          find . -maxdepth 1 -type f \( \
+              -name "*.esp.raw" \
+              -o -name "*.usr-*.*.raw.xz" \
+              -o -name "*.usr-*-verity.*.raw" \
+              -o -name "*.usr-*-verity-sig.*.raw" \
+              -o -name "SHA256SUMS" \
+            \) -print0 | while IFS= read -r -d '' f; do
+              aws s3 cp "$f" "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/" --cache-control "public, max-age=31536000, immutable"
+            done
+            
 
           # 2. SHA256SUMS
           # not cached, will change when new updates are uploaded
-          aws s3 cp mkosi.output/sysupdate/SHA256SUMS \
+          aws s3 cp mkosi.output/SHA256SUMS \
             "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/$ARCH/SHA256SUMS" \
             --content-type "text/plain" \
             --cache-control "no-cache"
 
           # 3. Live ISO + hash
           ISO_NAME="elementaryos-$OS_VERSION-daily-$ARCH.${{ steps.get_date.outputs.RELEASE_DATE }}.iso"
-          mv mkosi.output/elementary-liveiso.iso "mkosi.output/$ISO_NAME"
+          mv mkosi.output/elementaryos-9.0-*.iso "mkosi.output/$ISO_NAME"
           ( cd mkosi.output && sha256sum "$ISO_NAME" > "$ISO_NAME.sha256.txt" )
 
           ISO_DEST="s3://${{ secrets.R2_BUCKET_DAILY_INSTALLER }}/$ARCH"

From 57b526481c81c0262fe7916aacfeea924f495d71 Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Wed, 19 Aug 2026 08:17:19 -0700
Subject: [PATCH 2/3] remove immutable shasums

---
 .github/workflows/release.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 15c16b513..819cecee2 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -80,7 +80,6 @@ jobs:
               -o -name "*.usr-*.*.raw.xz" \
               -o -name "*.usr-*-verity.*.raw" \
               -o -name "*.usr-*-verity-sig.*.raw" \
-              -o -name "SHA256SUMS" \
             \) -print0 | while IFS= read -r -d '' f; do
               aws s3 cp "$f" "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/" --cache-control "public, max-age=31536000, immutable"
             done

From def3d57a826af08bbfeb366344f3dfd53e77a044 Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Wed, 19 Aug 2026 08:18:26 -0700
Subject: [PATCH 3/3] add arch

---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 819cecee2..5228c40d1 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -81,7 +81,7 @@ jobs:
               -o -name "*.usr-*-verity.*.raw" \
               -o -name "*.usr-*-verity-sig.*.raw" \
             \) -print0 | while IFS= read -r -d '' f; do
-              aws s3 cp "$f" "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/" --cache-control "public, max-age=31536000, immutable"
+              aws s3 cp "$f" "s3://$ARCH/${{ secrets.R2_BUCKET_DAILY_UPDATES }}/" --cache-control "public, max-age=31536000, immutable"
             done