From f1b61513d6f38dfaa480dc1abb572bff54a9727f Mon Sep 17 00:00:00 2001 From: Graham McIntire Date: Wed, 4 Mar 2026 17:33:10 -0600 Subject: [PATCH] fix: handle concurrent pushes in build workflow Add git pull --rebase before pushing deployment.yaml update to handle race conditions when multiple builds run. --- .forgejo/workflows/build.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 1bee8734..7a95be79 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -62,5 +62,9 @@ jobs: git config user.email "ci@git.mcintire.me" git config user.name "CI" git add k8s/deployment.yaml - git diff --cached --quiet || git commit -m "chore: update towerops-web image to ${{ steps.meta.outputs.tag }} [skip ci]" - git push origin HEAD:main + if ! git diff --cached --quiet; then + git commit -m "chore: update towerops-web image to ${{ steps.meta.outputs.tag }} [skip ci]" + # Pull with rebase to handle concurrent pushes + git pull --rebase origin main + git push origin HEAD:main + fi