Push the rendered manifests without rebasing

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-01 16:55:26 +01:00
parent b9b9062a27
commit f4d3951e85

View File

@@ -157,6 +157,9 @@ jobs:
fi
SHA="${{ gitea.sha }}"
git commit -m "deploy(lab): render ${SHA:0:12} [skip ci]"
# --autostash: gradlew.bat and mvnw.cmd show as modified in a fresh checkout (line endings).
git pull --rebase --autostash origin "${{ gitea.ref_name }}"
git push origin "HEAD:${{ gitea.ref_name }}"
# No rebase: gradlew.bat and mvnw.cmd always show as modified in a checkout (line endings),
# and git will not rebase a dirty tree. If the branch moved during the run, run it again.
git push origin "HEAD:${{ gitea.ref_name }}" || {
echo "::error::${{ gitea.ref_name }} moved while this job ran; run the workflow again"
exit 1
}