diff --git a/scripts/ci.sh b/scripts/ci.sh index 7e7a165..a629068 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -7,7 +7,6 @@ set -euo pipefail ROOT="$(cd "$(dirname "$0")/.." && pwd)" -export PATH="$HOME/go/bin:$PATH" cd "$ROOT" @@ -24,8 +23,7 @@ echo "========================================" # 1. 格式检查 echo "" echo "==> 1/3 格式检查 (gofumpt + goimports)" -test -z "$(gofumpt -l internal/ cmd/)" || { echo "gofumpt: 以下文件格式不正确:"; gofumpt -l internal/ cmd/; exit 1; } -test -z "$(goimports -l internal/ cmd/)" || { echo "goimports: 以下文件 import 不规范:"; goimports -l internal/ cmd/; exit 1; } +make fmt-check # 2. 编译检查 echo "" @@ -36,9 +34,9 @@ go build ./... echo "" echo "==> 3/3 静态分析 (golangci-lint)" if $STRICT; then - golangci-lint run ./... + make lint-strict else - golangci-lint run ./... || true + make lint fi echo ""