From 8f4d3d4170e7bd091e8644482a4e82805973ba3e Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Mon, 24 Mar 2025 12:52:20 +0000 Subject: [PATCH] chore(deps/dev): upgrade development dependencies, including golangci-lint (#12) --- .github/workflows/ci.yml | 2 +- Makefile | 36 +++++++----------------------------- 2 files changed, 8 insertions(+), 30 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a0e9db..a5d6ac4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version-file: go.mod + go-version: stable - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: diff --git a/Makefile b/Makefile index 15b676b..0c7c4f1 100644 --- a/Makefile +++ b/Makefile @@ -33,24 +33,19 @@ SHELL := env \ # # Tools # - -TOOLS += $(TOOLDIR)/gobin -$(TOOLDIR)/gobin: - GO111MODULE=off go get -u github.com/myitcv/gobin - # external tool define tool # 1: binary-name, 2: go-import-path TOOLS += $(TOOLDIR)/$(1) -$(TOOLDIR)/$(1): $(TOOLDIR)/gobin Makefile - gobin $(V) "$(2)" +$(TOOLDIR)/$(1): Makefile + GOBIN="$(CURDIR)/$(TOOLDIR)" go install "$(2)" endef -$(eval $(call tool,godoc,golang.org/x/tools/cmd/godoc)) -$(eval $(call tool,gofumpt,mvdan.cc/gofumpt)) -$(eval $(call tool,goimports,golang.org/x/tools/cmd/goimports)) -$(eval $(call tool,golangci-lint,github.com/golangci/golangci-lint/cmd/golangci-lint@v1.42)) -$(eval $(call tool,gomod,github.com/Helcaraxan/gomod)) +$(eval $(call tool,godoc,golang.org/x/tools/cmd/godoc@latest)) +$(eval $(call tool,gofumpt,mvdan.cc/gofumpt@latest)) +$(eval $(call tool,goimports,golang.org/x/tools/cmd/goimports@latest)) +$(eval $(call tool,golangci-lint,github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64)) +$(eval $(call tool,gomod,github.com/Helcaraxan/gomod@latest)) .PHONY: tools tools: $(TOOLS) @@ -186,20 +181,3 @@ check-tidy: docs: $(TOOLDIR)/godoc $(info serviing docs on http://127.0.0.1:6060/pkg/$(GOMODNAME)/) @godoc -http=127.0.0.1:6060 - -# -# Release -# - -.PHONY: new-version -new-version: check-npx - npx standard-version - -.PHONY: next-version -next-version: check-npx - npx standard-version --dry-run - -.PHONY: check-npx -check-npx: - $(if $(shell which npx),,\ - $(error No npx found in PATH, please install NodeJS))