From 56dbc3ff2c238b70f540d72622461752109a7436 Mon Sep 17 00:00:00 2001
From: funman300 <funman300@gmail.com>
Date: Wed, 13 May 2026 16:36:42 -0700
Subject: [PATCH] fix(ci): rebase before kustomization push to handle
 concurrent runs

Two runs for the same SHA racing to push the kustomization update
caused the second to fail with "failed to push some refs".

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .gitea/workflows/docker-build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml
index ed3f6b0..6b288d6 100644
--- a/.gitea/workflows/docker-build.yml
+++ b/.gitea/workflows/docker-build.yml
@@ -69,4 +69,5 @@ jobs:
           git config user.name "Gitea CI"
           git add deploy/kustomization.yaml
           git commit -m "chore(deploy): bump image to ${{ steps.meta.outputs.sha }} [skip ci]" || true
+          git pull --rebase origin master
           git push