From 4616bd946941bab98776341809405bcd5d09684d Mon Sep 17 00:00:00 2001
From: yuetsh <517252939@qq.com>
Date: Mon, 26 Oct 2026 18:49:25 +0800
Subject: [PATCH] =?UTF-8?q?ci:=20=E9=83=A8=E7=BD=B2=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E5=87=BA=E9=94=99=E5=8D=B3=E5=A4=B1=E8=B4=A5=EF=BC=8Cgit=20pul?=
 =?UTF-8?q?l=20=E6=98=BE=E5=BC=8F=E6=8C=87=E5=AE=9A=20origin=20main?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

服务器上的 main 没有设置上游分支，git pull --ff-only 报错后脚本照常往下执行，
用旧代码重新构建，CI 却显示成功，导致 e6a3da1 等提交一直没上线。

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .github/workflows/deploy.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 6fceae1..9fd7c2f 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -58,6 +58,7 @@ jobs:
           username: root
           key: ${{ secrets.KEY }}
           script: |
+            set -e
             cd /root/WebPreview
-            git pull --ff-only
+            git pull --ff-only origin main
             docker compose up -d --build