fix: pull --rebase before manifest push to avoid rejection

2026-08-08 21:04:53 +10:00 · 2026-04-25 11:00:34 +10:00
parent 9646cd7c7a
commit 971fa992dc
1 changed files with 2 additions and 0 deletions
@@ -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