fix(release): rebase appcast commit onto origin/main before pushing

The build takes ~10 minutes. Between checkout (at a tag, so HEAD is
detached) and the appcast push, code commits can land on main. The
resulting non-fast-forward push fails with exit code 1, breaking the
release job every time main is active during a build.

Fix: after committing the appcast update, fetch origin/main and rebase
onto it before pushing. appcast files are never touched by code commits
so the rebase will always be conflict-free, and the push will always
be a fast-forward.

Applied to both release.yml and nightly-dev.yml.

Author: fewtarius

.github/workflows/nightly-dev.yml

@@ -136,6 +136,10 @@ jobs:
             echo "No changes to development appcast files"
           else
             git commit -m "chore(dev-release): update appcast-dev.xml for v${DEV_VERSION}"
+            # The build takes time; commits may have landed on main. Fetch and rebase
+            # so our appcast commit lands on top before pushing.
+            git fetch origin main
+            git rebase origin/main
             git push origin HEAD:main
           fi
       

.github/workflows/release.yml

@@ -121,7 +121,12 @@ jobs:
             echo "No changes to appcast.xml"
           else
             git commit -m "chore(release): update appcast.xml for v${VERSION}"
-            # Checkout is triggered by a tag, so HEAD is detached - push explicitly to main
+            # Checkout is triggered by a tag, so HEAD is detached.
+            # The build takes ~10 minutes, so commits may have landed on main since
+            # we checked out. Fetch and rebase so our appcast commit lands on top,
+            # then push. This is race-condition-proof without force-pushing.
+            git fetch origin main
+            git rebase origin/main
             git push origin HEAD:main
           fi