From b9b9062a273ea558b664c05515c3b73432839180 Mon Sep 17 00:00:00 2001 From: Jonathan Boniface Date: Thu, 1 Oct 2026 16:51:44 +0100 Subject: [PATCH] Let the render job rebase despite line-ending noise in the checkout Co-Authored-By: Claude Opus 5.5 --- .gitea/workflows/build-lab.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build-lab.yml b/.gitea/workflows/build-lab.yml index 24362ad..6b951c6 100644 --- a/.gitea/workflows/build-lab.yml +++ b/.gitea/workflows/build-lab.yml @@ -157,5 +157,6 @@ jobs: fi SHA="${{ gitea.sha }}" git commit -m "deploy(lab): render ${SHA:0:12} [skip ci]" - git pull --rebase origin "${{ gitea.ref_name }}" + # --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 }}"