From 58e6404987785dfeb1ac3abc107c62e976aa5e6d Mon Sep 17 00:00:00 2001
From: "2569718930@qq.com" <2569718930@qq.com>
Date: Sun, 24 May 2026 22:40:43 +0800
Subject: [PATCH] =?UTF-8?q?CI=20=E9=83=A8=E7=BD=B2=E6=AD=A5=E9=AA=A4?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=20force=20pull=EF=BC=9Afetch=20+=20reset=20-?=
 =?UTF-8?q?-hard=20=E8=A6=86=E7=9B=96=E6=9C=AC=E5=9C=B0=E8=84=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 44cab4d1..c12f78ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -75,7 +75,7 @@ jobs:
           chmod 600 ~/.ssh/id_rsa
           ssh -o StrictHostKeyChecking=accept-new ${{ secrets.VPS_USER }}@${{ secrets.VPS_HOST }} "
             cd /root/PolyWeather
-            git pull origin main
+            git fetch origin main && git reset --hard origin/main
             docker compose up -d --build
             sleep 10
             curl -s http://localhost:8000/healthz