From 68bf5a9492d9ca0ffcb60464324def8f68a68042 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Thu, 12 Dec 2024 21:12:25 -0800
Subject: [PATCH] ci: on release, only upload appcast after binaries

---
 .github/workflows/release-tip.yml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release-tip.yml b/.github/workflows/release-tip.yml
index 911ac8db9..3310898a5 100644
--- a/.github/workflows/release-tip.yml
+++ b/.github/workflows/release-tip.yml
@@ -297,14 +297,14 @@ jobs:
           python3 ./dist/macos/update_appcast_tip.py
           test -f appcast_new.xml
 
-      # Update Blob Storage
+      # Upload our binaries first
       - name: Prep R2 Storage
         run: |
           mkdir blob
           mkdir -p blob/${GHOSTTY_COMMIT_LONG}
           cp ghostty-macos-universal.zip blob/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal.zip
           cp ghostty-macos-universal-dsym.zip blob/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal-dsym.zip
-          cp appcast_new.xml blob/appcast.xml
+
       - name: Upload to R2
         uses: ryand56/r2-upload-action@latest
         with:
@@ -315,6 +315,24 @@ jobs:
           source-dir: blob
           destination-dir: ./
 
+      # Now upload our appcast. This ensures that the appcast never
+      # gets out of sync with the binaries.
+      - name: Prep R2 Storage for Appcast
+        run: |
+          rm -r blob
+          mkdir blob
+          cp appcast_new.xml blob/appcast.xml
+
+      - name: Upload Appcast to R2
+        uses: ryand56/r2-upload-action@latest
+        with:
+          r2-account-id: ${{ secrets.CF_R2_TIP_ACCOUNT_ID }}
+          r2-access-key-id: ${{ secrets.CF_R2_TIP_AWS_KEY }}
+          r2-secret-access-key: ${{ secrets.CF_R2_TIP_SECRET_KEY }}
+          r2-bucket: ghostty-tip
+          source-dir: blob
+          destination-dir: ./
+
   build-macos-debug-slow:
     if: |
       ${{