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"