From df92a270c7d0e353703ac7450d78f06d7211211d Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Fri, 18 Oct 2024 15:07:37 -0600 Subject: [PATCH] Add deadcode to Makefile Signed-off-by: Jonathon Anderson --- Makefile | 5 +++++ Tools.mk | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/Makefile b/Makefile index 4c3cc10c..0f970b57 100644 --- a/Makefile +++ b/Makefile @@ -73,6 +73,10 @@ etc/bash_completion.d/wwctl: wwctl lint: $(config) $(GOLANGCI_LINT) run --build-tags "$(WW_GO_BUILD_TAGS)" --timeout=5m ./... +.PHONY: deadcode +deadcode: $(config) + $(GOLANG_DEADCODE) -test ./... + .PHONY: vet vet: $(config) go vet ./... @@ -221,6 +225,7 @@ wwapird: vendor dist: vendor lint: $(GOLANGCI_LINT) +deadcode: $(GOLANG_DEADCODE) protofiles = internal/pkg/api/routes/wwapiv1/routes.pb.go \ internal/pkg/api/routes/wwapiv1/routes.pb.gw.go \ diff --git a/Tools.mk b/Tools.mk index a8d3808e..aa5e49f5 100644 --- a/Tools.mk +++ b/Tools.mk @@ -7,6 +7,8 @@ GO_TOOLS_VENDOR := $(addprefix vendor/, $(GO_TOOLS)) GOLANGCI_LINT := $(TOOLS_BIN)/golangci-lint GOLANGCI_LINT_VERSION := v1.56.2 +GOLANG_DEADCODE := $(TOOLS_BIN)/deadcode + PROTOC := $(TOOLS_BIN)/protoc PROTOC_GEN_GO := $(TOOLS_BIN)/protoc-gen-go PROTOC_GEN_GO_GRPC := $(TOOLS_BIN)/protoc-gen-go-grpc @@ -32,6 +34,9 @@ $(GO_TOOLS_BIN): $(GOLANGCI_LINT): curl -qq -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TOOLS_BIN) $(GOLANGCI_LINT_VERSION) +$(GOLANG_DEADCODE): + GOBIN="$(PWD)/$(TOOLS_BIN)" go install golang.org/x/tools/cmd/deadcode@v0.24.0 + $(PROTOC): $(TOOLS_DIR) cd $(TOOLS_DIR) && curl -LO $(PROTOC_URL) && unzip -o $(notdir $(PROTOC_URL)) touch --no-create $(PROTOC) # by default the timestamp is preserved from the archive