From 5acf981bd432cd00e4267a18a0449d649e9be80f Mon Sep 17 00:00:00 2001
From: Max Litruv Boonzaayer <litruv@gmail.com>
Date: Sun, 17 May 2026 13:46:14 +1000
Subject: [PATCH] fix: enhance version bump process with retry logic and update
 subproject commit reference

---
 .gitea/workflows/build.yml | 18 +++++++++++++++++-
 cinny                      |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 11e57d7..accf3de 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -53,7 +53,23 @@ jobs:
           git config user.email "actions@github.com"
           git add package.json
           git commit -m "chore: bump version to ${{ steps.bump.outputs.VERSION }} [skip ci]"
-          git push
+          for attempt in 1 2 3; do
+            git fetch origin main
+            git rebase origin/main || {
+              git rebase --abort || true
+              echo "Failed to rebase version bump onto latest main"
+              exit 1
+            }
+
+            if git push origin HEAD:main; then
+              exit 0
+            fi
+
+            echo "Push rejected on attempt ${attempt}, retrying against latest main"
+          done
+
+          echo "Failed to push version bump after 3 attempts"
+          exit 1
 
   build-windows:
     runs-on: windows
diff --git a/cinny b/cinny
index a3caafa..3488606 160000
--- a/cinny
+++ b/cinny
@@ -1 +1 @@
-Subproject commit a3caafaf2041aa271a2412fe048da803acf37a74
+Subproject commit 3488606b68bf24e2da774fe7bd61714839280055