sts-sponsors team mailing list archive

[Anton Troyanov <mp+441580@xxxxxxxxxxxxxxxxxx>]

Anton Troyanov has proposed merging ~troyanov/maas:fix-lint-go into maas:master.

Commit message:
fix: lint-go target

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~troyanov/maas/+git/maas/+merge/441580
-- 
Your team MAAS Maintainers is requested to review the proposed merge of ~troyanov/maas:fix-lint-go into maas:master.

diff --git a/Makefile b/Makefile
index 33f4257..046dd23 100644
--- a/Makefile
+++ b/Makefile
@@ -189,8 +189,8 @@ lint-oapi: openapi.yaml
 .PHONY: lint-oapi
 
 # Go fmt
-lint-go:
-	@find src -type f -name go.mod -maxdepth 3 -execdir golangci-lint run -v ./... \; | \
+lint-go: $(BIN_DIR)/golangci-lint
+	@find src -type f -name go.mod -maxdepth 3 -execdir $(BIN_DIR)/golangci-lint run -v ./... \; | \
 		tee /tmp/golangci-lint.lint
 	@test ! -s /tmp/golangci-lint.lint
 .PHONY: lint-go
@@ -436,5 +436,5 @@ snap-tree-sync: $(UI_BUILD) go-bins $(SNAP_UNPACKED_DIR_MARKER)
 $(BIN_DIR)/golangci-lint: GOLANGCI_VERSION=1.51.2
 $(BIN_DIR)/golangci-lint: utilities/get_golangci-lint | $(BIN_DIR)
 	GOBIN="$(realpath $(dir $@))"
-	sh utilities/get_golangci-lint.sh "v${GOLANGCI_VERSION}"
+	sh utilities/get_golangci-lint "v${GOLANGCI_VERSION}"
 	touch $@