From 3efd67297ed0b26921e5e135a78fa192bee2ad52 Mon Sep 17 00:00:00 2001
From: wangjia <809946525@qq.com>
Date: Mon, 6 Jul 2026 14:40:09 +0800
Subject: [PATCH] =?UTF-8?q?ci(server):=20=E7=BC=96=E8=AF=91/=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=9B=B4=E6=8E=A5=E5=9C=A8=20runner=20=E8=B7=91,?=
 =?UTF-8?q?=E5=8E=BB=E5=B5=8C=E5=A5=97=20docker(=E4=BF=AE=20DinD;go=20?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E9=93=BE=E8=87=AA=E5=8A=A8=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

compile-backend/test.sh 原在 golang:1.25 容器里跑,job 容器内 $PWD 在宿主不存在
→ DinD 挂载失败。改直接跑;go.mod 要求 1.25.10,靠 Go 工具链经 goproxy.cn 自动拉取。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .gitea/workflows/deploy-server.yml | 11 ++++-------
 scripts/ci/test.sh                 | 13 ++++---------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/.gitea/workflows/deploy-server.yml b/.gitea/workflows/deploy-server.yml
index b478b5c..ed77eeb 100644
--- a/.gitea/workflows/deploy-server.yml
+++ b/.gitea/workflows/deploy-server.yml
@@ -17,13 +17,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Compile (Go 控制面, golang:1.25 容器内构建)
-        run: |
-          mkdir -p "$HOME/.cache/pangolin-ci/gomod" "$HOME/.cache/pangolin-ci/gobuild"
-          docker run --rm -v "$PWD:/w" -w /w \
-            -v "$HOME/.cache/pangolin-ci/gomod:/go/pkg/mod" \
-            -v "$HOME/.cache/pangolin-ci/gobuild:/root/.cache/go-build" \
-            golang:1.25 bash scripts/ci/compile-backend.sh
+      # 直接在 runner 跑(不嵌套 docker,避免 DinD 挂载失败)。runner 镜像的 go
+      # 若旧于 go.mod 要求(1.25.10),Go 工具链会经 GOPROXY=goproxy.cn 自动下载对应版本。
+      - name: Compile (Go 控制面)
+        run: bash scripts/ci/compile-backend.sh
 
       - name: Test (go test)
         run: bash scripts/ci/test.sh server
diff --git a/scripts/ci/test.sh b/scripts/ci/test.sh
index 6dd9210..fbb0c49 100755
--- a/scripts/ci/test.sh
+++ b/scripts/ci/test.sh
@@ -21,15 +21,10 @@ TARGET="${1:-}"
 
 case "$TARGET" in
   server)
-    mkdir -p "$HOME/.cache/pangolin-ci/gomod" "$HOME/.cache/pangolin-ci/gobuild"
-    echo "==> test: go test ./... (golang:1.25 容器)"
-    docker run --rm \
-      -v "$PWD/server:/app" -w /app \
-      -v "$HOME/.cache/pangolin-ci/gomod:/go/pkg/mod" \
-      -v "$HOME/.cache/pangolin-ci/gobuild:/root/.cache/go-build" \
-      -e GOPROXY="$GOPROXY" \
-      golang:1.25 \
-      go test ./...
+    # 直接在 runner 跑(不嵌套 docker,避免 DinD 挂载失败)。go.mod 要求的
+    # go 1.25.x 若高于 runner 自带版本,Go 工具链会经 GOPROXY(_env.sh)自动下载。
+    echo "==> test: go test ./..."
+    ( cd server && go test ./... )
     ;;
   client)
     mkdir -p "$HOME/.cache/pangolin-ci/pubcache"