From 971fa992dce31a3a3fb3e53c44c3ccc328dc0a45 Mon Sep 17 00:00:00 2001 From: Junwei Zhao Date: Sat, 25 Apr 2026 11:00:34 +1000 Subject: [PATCH] fix: pull --rebase before manifest push to avoid rejection --- .github/workflows/build-and-deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 4464beb..b71d81f 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -91,4 +91,6 @@ jobs: git config user.email "github-actions[bot]@users.noreply.github.com" git add k8s/manifest.yaml git commit -m "chore: update manifest image to 1.0.${{ github.run_number }} [skip ci]" + # Pull any commits pushed since this workflow started, then push + git pull --rebase origin main git push