diff --git a/tools/cli/Makefile b/tools/cli/Makefile index 2b6f6f9dd3..ffd1e236a2 100644 --- a/tools/cli/Makefile +++ b/tools/cli/Makefile @@ -35,7 +35,7 @@ devtools: ## Install dev tools @echo "==> Installing dev tools..." go install go.uber.org/mock/mockgen@latest go install github.com/oasdiff/oasdiff@v1.11.4 - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin $(GOLANGCI_VERSION) + go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCI_VERSION) .PHONY: setup setup: deps devtools ## Set up dev env diff --git a/tools/foas/Makefile b/tools/foas/Makefile index a6031d0ed9..a9623729f1 100644 --- a/tools/foas/Makefile +++ b/tools/foas/Makefile @@ -15,7 +15,7 @@ deps: ## Download go module dependencies .PHONY: devtools devtools: ## Install dev tools @echo "==> Installing dev tools..." - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin $(GOLANGCI_VERSION) + go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCI_VERSION) .PHONY: fmt fmt: ### Format all go files with goimports and gofmt diff --git a/tools/go.work.sum b/tools/go.work.sum index 3dbda54417..c419953e64 100644 --- a/tools/go.work.sum +++ b/tools/go.work.sum @@ -114,6 +114,7 @@ golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ= golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/telemetry v0.0.0-20260508192327-42602be52be6 h1:HjU6IWBiAgRIdAJ9/y1rwCn+UELEmwV+VsTLzj/W4sE= golang.org/x/telemetry v0.0.0-20260508192327-42602be52be6/go.mod h1:Eqhaxk/wZsWEH8CRxLwj6xzEJbz7k1EFGqx7nyCoabE= +golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164= golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE= golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.45.0 h1:18qN3FAooORvApf5XjCXgsuayZOEtXf6JK18I3+ONa8=