From 57bebfbf59ace5ebb48de785b6907a18ceebe547 Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Mon, 17 Aug 2026 08:22:36 -0700
Subject: [PATCH 01/18] fix and simplify s3 uploads

---
 .github/workflows/release.yaml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 053d4e263..3616d7156 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -54,16 +54,14 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: auto
+          AWS_ENDPOINT_URL: ${{ secrets.R2_ENDPOINT }}
         run: |
-          cd mkosi.output
-          for f in sysupdate/*.usr-*.raw.xz sysupdate/*.efi sysupdate/*.usr-*-verity*.raw sysupdate/*.usr-*-verity-sig*.raw SHA256SUMS; do
-            aws s3 cp "$f" "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/" \
-              --endpoint-url "${{ secrets.R2_ENDPOINT }}"
-          done
-          for f in elementary-liveiso.iso; do
-            aws s3 cp "$f" "s3://${{ secrets.R2_BUCKET_DAILY_INSTALLER }}/" \
-              --endpoint-url "${{ secrets.R2_ENDPOINT }}"
-          done
+          aws s3 cp mkosi.output/sysupdate/*.usr-*.raw.xz "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
+          aws s3 cp mkosi.output/sysupdate/*.efi "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
+          aws s3 cp mkosi.output/sysupdate/*.usr-*-verity*.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
+          aws s3 cp mkosi.output/sysupdate/*.usr-*-verity-sig*.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
+          aws s3 cp mkosi.output/sysupdate/SHA256SUMS "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
+          aws s3 cp "elementary-liveiso.iso" "s3://${{ secrets.R2_BUCKET_DAILY_INSTALLER }}/"
 
 
       - name: Create Release and Upload Artifacts
@@ -72,7 +70,7 @@ jobs:
           tag_name: ${{ steps.get_date.outputs.RELEASE_TAG }}
           name: Release ${{ steps.get_date.outputs.RELEASE_TAG }}
           files: |
-            mkosi.output/sysupdate/*.efi
-            mkosi.output/sysupdate/*.usr-*-verity*.raw
-            mkosi.output/sysupdate/*.usr-*-verity-sig*.raw
-            mkosi.output/sysupdate/SHA256SUMS
+          
+          
+          
+          

From 0ec8eda7197a8c0fbe888335039113eedbdfb0d8 Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Mon, 17 Aug 2026 08:22:56 -0700
Subject: [PATCH 02/18] fix uploads

---
 .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 3616d7156..574170c1e 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -56,12 +56,12 @@ jobs:
           AWS_DEFAULT_REGION: auto
           AWS_ENDPOINT_URL: ${{ secrets.R2_ENDPOINT }}
         run: |
+          aws s3 cp "elementary-liveiso.iso" "s3://${{ secrets.R2_BUCKET_DAILY_INSTALLER }}/"
           aws s3 cp mkosi.output/sysupdate/*.usr-*.raw.xz "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
           aws s3 cp mkosi.output/sysupdate/*.efi "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
           aws s3 cp mkosi.output/sysupdate/*.usr-*-verity*.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
           aws s3 cp mkosi.output/sysupdate/*.usr-*-verity-sig*.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
           aws s3 cp mkosi.output/sysupdate/SHA256SUMS "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
-          aws s3 cp "elementary-liveiso.iso" "s3://${{ secrets.R2_BUCKET_DAILY_INSTALLER }}/"
 
 
       - name: Create Release and Upload Artifacts

From f68d1f7c5cbb3a0619b290f7b92f0f6de7031b53 Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Mon, 17 Aug 2026 08:24:37 -0700
Subject: [PATCH 03/18] simplify

---
 .github/workflows/release.yaml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 574170c1e..45b616ce2 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -56,7 +56,7 @@ jobs:
           AWS_DEFAULT_REGION: auto
           AWS_ENDPOINT_URL: ${{ secrets.R2_ENDPOINT }}
         run: |
-          aws s3 cp "elementary-liveiso.iso" "s3://${{ secrets.R2_BUCKET_DAILY_INSTALLER }}/"
+          aws s3 cp mkosi.output/elementary-liveiso.iso "s3://${{ secrets.R2_BUCKET_DAILY_INSTALLER }}/"
           aws s3 cp mkosi.output/sysupdate/*.usr-*.raw.xz "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
           aws s3 cp mkosi.output/sysupdate/*.efi "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
           aws s3 cp mkosi.output/sysupdate/*.usr-*-verity*.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
@@ -70,7 +70,9 @@ jobs:
           tag_name: ${{ steps.get_date.outputs.RELEASE_TAG }}
           name: Release ${{ steps.get_date.outputs.RELEASE_TAG }}
           files: |
-          
-          
-          
+            mkosi.output/sysupdate/*.efi
+            mkosi.output/sysupdate/*.usr-*-verity*.raw
+            mkosi.output/sysupdate/*.usr-*-verity-sig*.raw
+            mkosi.output/sysupdate/SHA256SUMS
+
           

From 708a3ec06db6df83f33892e1671eadb3c8fbbd04 Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Mon, 17 Aug 2026 11:01:24 -0700
Subject: [PATCH 04/18] debug

---
 .github/workflows/release.yaml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 45b616ce2..46195a348 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -49,19 +49,19 @@ jobs:
           TIMESTAMP=$(basename "$FILE_PATH" | sed 's/^elementary_//;s/\..*//')
           echo "RELEASE_TAG=os9-$TIMESTAMP" >> "$GITHUB_OUTPUT"
 
-      - name: Upload usr, iso and SHA256SUMS to Bucket
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: auto
-          AWS_ENDPOINT_URL: ${{ secrets.R2_ENDPOINT }}
-        run: |
-          aws s3 cp mkosi.output/elementary-liveiso.iso "s3://${{ secrets.R2_BUCKET_DAILY_INSTALLER }}/"
-          aws s3 cp mkosi.output/sysupdate/*.usr-*.raw.xz "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
-          aws s3 cp mkosi.output/sysupdate/*.efi "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
-          aws s3 cp mkosi.output/sysupdate/*.usr-*-verity*.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
-          aws s3 cp mkosi.output/sysupdate/*.usr-*-verity-sig*.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
-          aws s3 cp mkosi.output/sysupdate/SHA256SUMS "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
+      # - name: Upload usr, iso and SHA256SUMS to Bucket
+      #   env:
+      #     AWS_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
+      #     AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
+      #     AWS_DEFAULT_REGION: auto
+      #     AWS_ENDPOINT_URL: ${{ secrets.R2_ENDPOINT }}
+      #   run: |
+      #     aws s3 cp mkosi.output/elementary-liveiso.iso "s3://${{ secrets.R2_BUCKET_DAILY_INSTALLER }}/"
+      #     aws s3 cp mkosi.output/sysupdate/*.usr-*.raw.xz "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
+      #     aws s3 cp mkosi.output/sysupdate/*.efi "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
+      #     aws s3 cp mkosi.output/sysupdate/*.usr-*-verity*.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
+      #     aws s3 cp mkosi.output/sysupdate/*.usr-*-verity-sig*.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
+      #     aws s3 cp mkosi.output/sysupdate/SHA256SUMS "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
 
 
       - name: Create Release and Upload Artifacts
@@ -70,6 +70,7 @@ jobs:
           tag_name: ${{ steps.get_date.outputs.RELEASE_TAG }}
           name: Release ${{ steps.get_date.outputs.RELEASE_TAG }}
           files: |
+            mkosi.output/sysupdate/*.usr-*.raw.xz
             mkosi.output/sysupdate/*.efi
             mkosi.output/sysupdate/*.usr-*-verity*.raw
             mkosi.output/sysupdate/*.usr-*-verity-sig*.raw

From f2cc82d00c22b6adec90f565f3a52d739ef057ad Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Mon, 17 Aug 2026 12:53:40 -0700
Subject: [PATCH 05/18] globs!

---
 .github/workflows/release.yaml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 46195a348..866b87b91 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -49,19 +49,19 @@ jobs:
           TIMESTAMP=$(basename "$FILE_PATH" | sed 's/^elementary_//;s/\..*//')
           echo "RELEASE_TAG=os9-$TIMESTAMP" >> "$GITHUB_OUTPUT"
 
-      # - name: Upload usr, iso and SHA256SUMS to Bucket
-      #   env:
-      #     AWS_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
-      #     AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
-      #     AWS_DEFAULT_REGION: auto
-      #     AWS_ENDPOINT_URL: ${{ secrets.R2_ENDPOINT }}
-      #   run: |
-      #     aws s3 cp mkosi.output/elementary-liveiso.iso "s3://${{ secrets.R2_BUCKET_DAILY_INSTALLER }}/"
-      #     aws s3 cp mkosi.output/sysupdate/*.usr-*.raw.xz "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
-      #     aws s3 cp mkosi.output/sysupdate/*.efi "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
-      #     aws s3 cp mkosi.output/sysupdate/*.usr-*-verity*.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
-      #     aws s3 cp mkosi.output/sysupdate/*.usr-*-verity-sig*.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
-      #     aws s3 cp mkosi.output/sysupdate/SHA256SUMS "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
+      - name: Upload usr, iso and SHA256SUMS to Bucket
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: auto
+          AWS_ENDPOINT_URL: ${{ secrets.R2_ENDPOINT }}
+        run: |
+          aws s3 cp mkosi.output/sysupdate/*.efi "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
+          aws s3 cp mkosi.output/sysupdate/*.usr-{x86-64,arm64}.raw.xz "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
+          aws s3 cp mkosi.output/sysupdate/*.usr-{x86-64,arm64}-verity.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
+          aws s3 cp mkosi.output/sysupdate/*.usr-{x86-64,arm64}-verity-sig.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
+          aws s3 cp mkosi.output/sysupdate/SHA256SUMS "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
+          aws s3 cp mkosi.output/elementary-liveiso.iso "s3://${{ secrets.R2_BUCKET_DAILY_INSTALLER }}/"
 
 
       - name: Create Release and Upload Artifacts

From 6c67cec15c40a4b4f552df3e2da49328c8943989 Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Mon, 17 Aug 2026 13:03:19 -0700
Subject: [PATCH 06/18] more precise globs

---
 .github/workflows/release.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 866b87b91..0f99f3fb1 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -33,7 +33,7 @@ jobs:
 
       - name: Compress (xz) usr partition
         run: |
-          find mkosi.output/sysupdate -maxdepth 1 -type f -name "*.usr-x86-64.raw" -exec xz -5v -T0 {} +
+          find mkosi.output/sysupdate -maxdepth 1 -type f -name "*.usr-{x86-64,arm64}.raw" -exec xz -5v -T0 {} +
 
       - name: Generate SHA256SUMS (all partitions)
         run: |
@@ -70,10 +70,10 @@ jobs:
           tag_name: ${{ steps.get_date.outputs.RELEASE_TAG }}
           name: Release ${{ steps.get_date.outputs.RELEASE_TAG }}
           files: |
-            mkosi.output/sysupdate/*.usr-*.raw.xz
             mkosi.output/sysupdate/*.efi
-            mkosi.output/sysupdate/*.usr-*-verity*.raw
-            mkosi.output/sysupdate/*.usr-*-verity-sig*.raw
+            mkosi.output/sysupdate/*.usr-{x86-64,arm64}.raw.xz
+            mkosi.output/sysupdate/*.usr-{x86-64,arm64}-verity.raw
+            mkosi.output/sysupdate/*.usr-{x86-64,arm64}-verity-sig.raw
             mkosi.output/sysupdate/SHA256SUMS
 
           

From f2098606a4fc1d538e6631a0b154db9298277bd2 Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Mon, 17 Aug 2026 13:13:35 -0700
Subject: [PATCH 07/18] working

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

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 0f99f3fb1..26cf4a5e0 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -56,7 +56,7 @@ jobs:
           AWS_DEFAULT_REGION: auto
           AWS_ENDPOINT_URL: ${{ secrets.R2_ENDPOINT }}
         run: |
-          aws s3 cp mkosi.output/sysupdate/*.efi "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
+          aws s3 cp mkosi.output/sysupdate/*.esp.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
           aws s3 cp mkosi.output/sysupdate/*.usr-{x86-64,arm64}.raw.xz "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
           aws s3 cp mkosi.output/sysupdate/*.usr-{x86-64,arm64}-verity.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
           aws s3 cp mkosi.output/sysupdate/*.usr-{x86-64,arm64}-verity-sig.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
@@ -64,16 +64,16 @@ jobs:
           aws s3 cp mkosi.output/elementary-liveiso.iso "s3://${{ secrets.R2_BUCKET_DAILY_INSTALLER }}/"
 
 
-      - name: Create Release and Upload Artifacts
-        uses: softprops/action-gh-release@v3
-        with:
-          tag_name: ${{ steps.get_date.outputs.RELEASE_TAG }}
-          name: Release ${{ steps.get_date.outputs.RELEASE_TAG }}
-          files: |
-            mkosi.output/sysupdate/*.efi
-            mkosi.output/sysupdate/*.usr-{x86-64,arm64}.raw.xz
-            mkosi.output/sysupdate/*.usr-{x86-64,arm64}-verity.raw
-            mkosi.output/sysupdate/*.usr-{x86-64,arm64}-verity-sig.raw
-            mkosi.output/sysupdate/SHA256SUMS
+      # - name: Create Release and Upload Artifacts
+      #   uses: softprops/action-gh-release@v3
+      #   with:
+      #     tag_name: ${{ steps.get_date.outputs.RELEASE_TAG }}
+      #     name: Release ${{ steps.get_date.outputs.RELEASE_TAG }}
+      #     files: |
+      #       mkosi.output/sysupdate/*.esp.raw
+      #       mkosi.output/sysupdate/*.usr-{x86-64,arm64}.raw.xz
+      #       mkosi.output/sysupdate/*.usr-{x86-64,arm64}-verity.raw
+      #       mkosi.output/sysupdate/*.usr-{x86-64,arm64}-verity-sig.raw
+      #       mkosi.output/sysupdate/SHA256SUMS
 
           

From 5363fd6732f581819ec844be0d2ffe36391d8210 Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Mon, 17 Aug 2026 13:44:07 -0700
Subject: [PATCH 08/18] remove previous output

---
 .github/workflows/release.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 26cf4a5e0..7de50a82b 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -23,6 +23,9 @@ jobs:
       - name: Generate key
         run: just genkey
 
+      - name: Remove previous output
+        run: sudo rm -rf mkosi.output
+
       - name: Release
         run: just do-release
 

From 77232af0408f609c31f94fdfbeb38c032de6f787 Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Mon, 17 Aug 2026 13:51:35 -0700
Subject: [PATCH 09/18] another method

---
 .github/workflows/release.yaml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 7de50a82b..d375e8da9 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -23,9 +23,6 @@ jobs:
       - name: Generate key
         run: just genkey
 
-      - name: Remove previous output
-        run: sudo rm -rf mkosi.output
-
       - name: Release
         run: just do-release
 
@@ -59,13 +56,13 @@ jobs:
           AWS_DEFAULT_REGION: auto
           AWS_ENDPOINT_URL: ${{ secrets.R2_ENDPOINT }}
         run: |
-          aws s3 cp mkosi.output/sysupdate/*.esp.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
-          aws s3 cp mkosi.output/sysupdate/*.usr-{x86-64,arm64}.raw.xz "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
-          aws s3 cp mkosi.output/sysupdate/*.usr-{x86-64,arm64}-verity.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
-          aws s3 cp mkosi.output/sysupdate/*.usr-{x86-64,arm64}-verity-sig.raw "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
-          aws s3 cp mkosi.output/sysupdate/SHA256SUMS "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/"
-          aws s3 cp mkosi.output/elementary-liveiso.iso "s3://${{ secrets.R2_BUCKET_DAILY_INSTALLER }}/"
-
+          aws s3 sync mkosi.output/sysupdate/ "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/" \
+            --exclude "*" \
+            --include="*.esp.raw" \
+            --include=*.usr-{x86-64,arm64}.raw.xz \
+            --include=*.usr-{x86-64,arm64}-verity.raw \
+            --include=*.usr-{x86-64,arm64}-verity-sig.raw \
+            --include="SHA256SUMS"
 
       # - name: Create Release and Upload Artifacts
       #   uses: softprops/action-gh-release@v3

From 8b7b0885c90500a3fa086b89a94e6e671a43ba2c Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Mon, 17 Aug 2026 14:20:47 -0700
Subject: [PATCH 10/18] re-add installer

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

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index d375e8da9..6df723325 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -63,6 +63,8 @@ jobs:
             --include=*.usr-{x86-64,arm64}-verity.raw \
             --include=*.usr-{x86-64,arm64}-verity-sig.raw \
             --include="SHA256SUMS"
+          aws s3 cp mkosi.output/elementary-liveiso.iso "s3://${{ secrets.R2_BUCKET_DAILY_INSTALLER }}/"
+
 
       # - name: Create Release and Upload Artifacts
       #   uses: softprops/action-gh-release@v3

From aa388cbe92e9e692d6d09d7e3668283715b45dd4 Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Mon, 17 Aug 2026 14:45:06 -0700
Subject: [PATCH 11/18] revert

---
 .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 6df723325..59d53b4b8 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -33,7 +33,7 @@ jobs:
 
       - name: Compress (xz) usr partition
         run: |
-          find mkosi.output/sysupdate -maxdepth 1 -type f -name "*.usr-{x86-64,arm64}.raw" -exec xz -5v -T0 {} +
+          find mkosi.output/sysupdate -maxdepth 1 -type f -name "*.usr-*.raw" -exec xz -5v -T0 {} +
 
       - name: Generate SHA256SUMS (all partitions)
         run: |

From 8070e4b069753f50319d8edfcdc06ad682acacd0 Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Mon, 17 Aug 2026 14:45:42 -0700
Subject: [PATCH 12/18] revert

---
 .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 59d53b4b8..d0cc5088a 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -33,7 +33,7 @@ jobs:
 
       - name: Compress (xz) usr partition
         run: |
-          find mkosi.output/sysupdate -maxdepth 1 -type f -name "*.usr-*.raw" -exec xz -5v -T0 {} +
+          find mkosi.output/sysupdate -maxdepth 1 -type f -name "*.usr-x86-64.raw" -exec xz -5v -T0 {} +
 
       - name: Generate SHA256SUMS (all partitions)
         run: |

From 05eaa0355f011372b0a584257f6cf66a9da25d18 Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Mon, 17 Aug 2026 15:35:22 -0700
Subject: [PATCH 13/18] cleanup sha

---
 .github/workflows/release.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index d0cc5088a..60fcac34d 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -37,9 +37,8 @@ jobs:
 
       - name: Generate SHA256SUMS (all partitions)
         run: |
-          cd mkosi.output
-          sha256sum sysupdate/*.efi sysupdate/*.usr-*.raw.xz sysupdate/*.usr-*-verity*.raw sysupdate/*.usr-*-verity-sig*.raw \
-            | sed 's|sysupdate/||' > SHA256SUMS
+          cd mkosi.output/sysupdate
+          sha256sum sysupdate/*.usr-*.raw.xz *.usr-*-verity.raw *.usr-*-verity-sig.raw > SHA256SUMS
           cat SHA256SUMS
 
       - name: Extract Date

From 64e32d71fe92c51e78005f81919a76819601dc7a Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Mon, 17 Aug 2026 15:37:06 -0700
Subject: [PATCH 14/18] test

---
 .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 60fcac34d..a5112c894 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -38,7 +38,7 @@ jobs:
       - name: Generate SHA256SUMS (all partitions)
         run: |
           cd mkosi.output/sysupdate
-          sha256sum sysupdate/*.usr-*.raw.xz *.usr-*-verity.raw *.usr-*-verity-sig.raw > SHA256SUMS
+          sha256sum *.usr-*.raw.xz *.usr-*-verity.raw *.usr-*-verity-sig.raw > SHA256SUMS
           cat SHA256SUMS
 
       - name: Extract Date

From 8217e77c82e57f55ac9f8e1741819d97de0643ab Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Mon, 17 Aug 2026 16:46:21 -0700
Subject: [PATCH 15/18] simplify sha command

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

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a5112c894..21677a344 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -38,7 +38,7 @@ jobs:
       - name: Generate SHA256SUMS (all partitions)
         run: |
           cd mkosi.output/sysupdate
-          sha256sum *.usr-*.raw.xz *.usr-*-verity.raw *.usr-*-verity-sig.raw > SHA256SUMS
+          sha256sum *.esp.raw *.usr-*.raw.xz *.usr-*-verity*.raw *.usr-*-verity-sig*.raw > SHA256SUMS
           cat SHA256SUMS
 
       - name: Extract Date
@@ -57,10 +57,10 @@ jobs:
         run: |
           aws s3 sync mkosi.output/sysupdate/ "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/" \
             --exclude "*" \
-            --include="*.esp.raw" \
-            --include=*.usr-{x86-64,arm64}.raw.xz \
-            --include=*.usr-{x86-64,arm64}-verity.raw \
-            --include=*.usr-{x86-64,arm64}-verity-sig.raw \
+            --include=*.esp.raw \
+            --include=*.usr-*.raw.xz \
+            --include=*.usr-*-verity.raw \
+            --include=*.usr-*-verity-sig.raw \
             --include="SHA256SUMS"
           aws s3 cp mkosi.output/elementary-liveiso.iso "s3://${{ secrets.R2_BUCKET_DAILY_INSTALLER }}/"
 
@@ -72,9 +72,9 @@ jobs:
       #     name: Release ${{ steps.get_date.outputs.RELEASE_TAG }}
       #     files: |
       #       mkosi.output/sysupdate/*.esp.raw
-      #       mkosi.output/sysupdate/*.usr-{x86-64,arm64}.raw.xz
-      #       mkosi.output/sysupdate/*.usr-{x86-64,arm64}-verity.raw
-      #       mkosi.output/sysupdate/*.usr-{x86-64,arm64}-verity-sig.raw
+      #       mkosi.output/sysupdate/*.usr-*.raw.xz
+      #       mkosi.output/sysupdate/*.usr-*-verity.raw
+      #       mkosi.output/sysupdate/*.usr-*-verity-sig.raw
       #       mkosi.output/sysupdate/SHA256SUMS
 
           

From 6e1ea529cff2e3e7901dc70e031ca7bc823a24d6 Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Mon, 17 Aug 2026 16:50:51 -0700
Subject: [PATCH 16/18] compress the other one

---
 .github/workflows/release.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 21677a344..5c9596693 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -33,7 +33,7 @@ jobs:
 
       - name: Compress (xz) usr partition
         run: |
-          find mkosi.output/sysupdate -maxdepth 1 -type f -name "*.usr-x86-64.raw" -exec xz -5v -T0 {} +
+          find mkosi.output/sysupdate -maxdepth 1 -type f -name "*.usr-*.raw" ! -name "*verity*" -exec xz -7v -T0 {} +
 
       - name: Generate SHA256SUMS (all partitions)
         run: |
@@ -59,8 +59,8 @@ jobs:
             --exclude "*" \
             --include=*.esp.raw \
             --include=*.usr-*.raw.xz \
-            --include=*.usr-*-verity.raw \
-            --include=*.usr-*-verity-sig.raw \
+            --include=*.usr-*-verity*.raw \
+            --include=*.usr-*-verity-sig*.raw \
             --include="SHA256SUMS"
           aws s3 cp mkosi.output/elementary-liveiso.iso "s3://${{ secrets.R2_BUCKET_DAILY_INSTALLER }}/"
 

From daba93c845a5ea9433f54047d91d90e69b83d186 Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Mon, 17 Aug 2026 16:52:00 -0700
Subject: [PATCH 17/18] initial

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

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 5c9596693..1dacc44dc 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -64,17 +64,3 @@ jobs:
             --include="SHA256SUMS"
           aws s3 cp mkosi.output/elementary-liveiso.iso "s3://${{ secrets.R2_BUCKET_DAILY_INSTALLER }}/"
 
-
-      # - name: Create Release and Upload Artifacts
-      #   uses: softprops/action-gh-release@v3
-      #   with:
-      #     tag_name: ${{ steps.get_date.outputs.RELEASE_TAG }}
-      #     name: Release ${{ steps.get_date.outputs.RELEASE_TAG }}
-      #     files: |
-      #       mkosi.output/sysupdate/*.esp.raw
-      #       mkosi.output/sysupdate/*.usr-*.raw.xz
-      #       mkosi.output/sysupdate/*.usr-*-verity.raw
-      #       mkosi.output/sysupdate/*.usr-*-verity-sig.raw
-      #       mkosi.output/sysupdate/SHA256SUMS
-
-          

From b257566377719fa8ba1b59b23e4a22234b742dca Mon Sep 17 00:00:00 2001
From: nikodunk <n.dunkel@gmail.com>
Date: Mon, 17 Aug 2026 16:58:43 -0700
Subject: [PATCH 18/18] test

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

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 1dacc44dc..fd49d07a7 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -38,7 +38,11 @@ jobs:
       - name: Generate SHA256SUMS (all partitions)
         run: |
           cd mkosi.output/sysupdate
-          sha256sum *.esp.raw *.usr-*.raw.xz *.usr-*-verity*.raw *.usr-*-verity-sig*.raw > SHA256SUMS
+          sha256sum *.esp.raw \
+              *.usr-*.*.raw.xz \
+              *.usr-*-verity.*.raw \
+              *.usr-*-verity-sig.*.raw \
+              > SHA256SUMS
           cat SHA256SUMS
 
       - name: Extract Date
@@ -58,9 +62,9 @@ jobs:
           aws s3 sync mkosi.output/sysupdate/ "s3://${{ secrets.R2_BUCKET_DAILY_UPDATES }}/" \
             --exclude "*" \
             --include=*.esp.raw \
-            --include=*.usr-*.raw.xz \
-            --include=*.usr-*-verity*.raw \
-            --include=*.usr-*-verity-sig*.raw \
+            --include=*.usr-*.*.raw.xz \
+            --include=*.usr-*-verity.*.raw \
+            --include=*.usr-*-verity-sig.*.raw \
             --include="SHA256SUMS"
           aws s3 cp mkosi.output/elementary-liveiso.iso "s3://${{ secrets.R2_BUCKET_DAILY_INSTALLER }}/"