From a75936fdd630af92f96b4f62f59b99e5ba011363 Mon Sep 17 00:00:00 2001 From: Alexander Bocken Date: Fri, 2 Jan 2026 21:46:36 +0100 Subject: [PATCH] fix: correct deployment workflow to force sync with remote Fix the deployment script to properly force the remote server to always match the git repository state, regardless of local changes. Changes: - Replace invalid `git pull --force` with proper fetch and reset - Add `git remote set-url origin` to ensure correct URL with auth token - Use `git fetch origin` to download latest changes - Use `git reset --hard origin/master` to force match remote state This ensures clean deployments even if there are local modifications or conflicts on the remote server, while preserving untracked files like .env. --- .gitea/workflows/upload.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/upload.yml b/.gitea/workflows/upload.yml index 38209893..c5d9061f 100644 --- a/.gitea/workflows/upload.yml +++ b/.gitea/workflows/upload.yml @@ -28,7 +28,8 @@ jobs: port: 22 script: | cd /usr/share/webapps/homepage - git pull --force https://Alexander:${{ secrets.homepage_gitea_token }}@git.bocken.org/Alexander/homepage + git remote set-url origin https://Alexander:${{ secrets.homepage_gitea_token }}@git.bocken.org/Alexander/homepage + git fetch origin git reset --hard origin/master npm run build sudo systemctl restart homepage.service