From 58d6a45b38a621796f9d4509f95e88dc02ecdbe0 Mon Sep 17 00:00:00 2001 From: Victor_Jay Date: Mon, 22 Jun 2026 02:30:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Makefile=20=E4=BD=BF=E7=94=A8=20GOBIN=20?= =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84=EF=BC=8C=E9=81=BF=E5=85=8D?= =?UTF-8?q?=20Git=20hook=20=E7=8E=AF=E5=A2=83=20PATH=20=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 14f3221..a4ca083 100644 --- a/Makefile +++ b/Makefile @@ -1,28 +1,33 @@ .PHONY: lint fmt check test +GOBIN := $(HOME)/go/bin +BIN_GOFUMPT := $(GOBIN)/gofumpt +BIN_GOIMPORTS := $(GOBIN)/goimports +BIN_LINT := $(GOBIN)/golangci-lint + # === 代码格式化 === fmt: @echo "==> gofumpt..." - @gofumpt -l -w internal/ cmd/ + @$(BIN_GOFUMPT) -l -w internal/ cmd/ @echo "==> goimports..." - @goimports -w internal/ cmd/ + @$(BIN_GOIMPORTS) -w internal/ cmd/ # === 格式检查(CI 用,只读不改) === fmt-check: @echo "==> gofumpt check..." - @test -z "$$(gofumpt -l internal/ cmd/)" || (echo "gofumpt: 以下文件格式不正确:" && gofumpt -l internal/ cmd/ && exit 1) + @test -z "$$($(BIN_GOFUMPT) -l internal/ cmd/)" || (echo "gofumpt: 以下文件格式不正确:" && $(BIN_GOFUMPT) -l internal/ cmd/ && exit 1) @echo "==> goimports check..." - @test -z "$$(goimports -l internal/ cmd/)" || (echo "goimports: 以下文件 import 不规范:" && goimports -l internal/ cmd/ && exit 1) + @test -z "$$($(BIN_GOIMPORTS) -l internal/ cmd/)" || (echo "goimports: 以下文件 import 不规范:" && $(BIN_GOIMPORTS) -l internal/ cmd/ && exit 1) # === 静态分析(报告模式,不阻断) === lint: @echo "==> golangci-lint (report only)..." - @golangci-lint run ./... || true + @$(BIN_LINT) run ./... || true # === 静态分析(阻断模式,CI 用) === lint-strict: @echo "==> golangci-lint (strict)..." - @golangci-lint run ./... + @$(BIN_LINT) run ./... # === 测试 === test: