Skip to content

Commit 3fec818

Browse files
committed
chore(deps/dev): upgrade development dependencies, including golangci-lint
1 parent b2112ca commit 3fec818

File tree

2 files changed

+8
-30
lines changed

2 files changed

+8
-30
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v4
1515
- uses: actions/setup-go@v5
1616
with:
17-
go-version-file: go.mod
17+
go-version: stable
1818
- name: golangci-lint
1919
uses: golangci/golangci-lint-action@v6
2020
with:

Makefile

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,19 @@ SHELL := env \
3333
#
3434
# Tools
3535
#
36-
37-
TOOLS += $(TOOLDIR)/gobin
38-
$(TOOLDIR)/gobin:
39-
GO111MODULE=off go get -u github.com/myitcv/gobin
40-
4136
# external tool
4237
define tool # 1: binary-name, 2: go-import-path
4338
TOOLS += $(TOOLDIR)/$(1)
4439

45-
$(TOOLDIR)/$(1): $(TOOLDIR)/gobin Makefile
46-
gobin $(V) "$(2)"
40+
$(TOOLDIR)/$(1): Makefile
41+
GOBIN="$(CURDIR)/$(TOOLDIR)" go install "$(2)"
4742
endef
4843

49-
$(eval $(call tool,godoc,golang.org/x/tools/cmd/godoc))
50-
$(eval $(call tool,gofumpt,mvdan.cc/gofumpt))
51-
$(eval $(call tool,goimports,golang.org/x/tools/cmd/goimports))
52-
$(eval $(call tool,golangci-lint,github.com/golangci/golangci-lint/cmd/golangci-lint@v1.42))
53-
$(eval $(call tool,gomod,github.com/Helcaraxan/gomod))
44+
$(eval $(call tool,godoc,golang.org/x/tools/cmd/godoc@latest))
45+
$(eval $(call tool,gofumpt,mvdan.cc/gofumpt@latest))
46+
$(eval $(call tool,goimports,golang.org/x/tools/cmd/goimports@latest))
47+
$(eval $(call tool,golangci-lint,github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64))
48+
$(eval $(call tool,gomod,github.com/Helcaraxan/gomod@latest))
5449

5550
.PHONY: tools
5651
tools: $(TOOLS)
@@ -186,20 +181,3 @@ check-tidy:
186181
docs: $(TOOLDIR)/godoc
187182
$(info serviing docs on http://127.0.0.1:6060/pkg/$(GOMODNAME)/)
188183
@godoc -http=127.0.0.1:6060
189-
190-
#
191-
# Release
192-
#
193-
194-
.PHONY: new-version
195-
new-version: check-npx
196-
npx standard-version
197-
198-
.PHONY: next-version
199-
next-version: check-npx
200-
npx standard-version --dry-run
201-
202-
.PHONY: check-npx
203-
check-npx:
204-
$(if $(shell which npx),,\
205-
$(error No npx found in PATH, please install NodeJS))

0 commit comments

Comments
 (0)