sts-sponsors team mailing list archive

[Anton Troyanov <mp+442035@xxxxxxxxxxxxxxxxxx>]

Anton Troyanov has proposed merging ~troyanov/maas:maasagent-cleanup into maas:master.

Commit message:
chore(ci): remove verbose print from golangci-lint

Requested reviews:
  MAAS Maintainers (maas-maintainers)

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

diff --git a/Makefile b/Makefile
index 53fc526..8215f4c 100644
--- a/Makefile
+++ b/Makefile
@@ -189,8 +189,13 @@ lint-oapi: openapi.yaml
 .PHONY: lint-oapi
 
 # Go fmt
+<<<<<<< Makefile
 lint-go: $(BIN_DIR)/golangci-lint
 	@find src -maxdepth 3 -type f -name go.mod -execdir golangci-lint run -v ./... \; | \
+=======
+lint-go:
+	@find src -type f -name go.mod -maxdepth 3 -execdir golangci-lint run ./... \; | \
+>>>>>>> Makefile
 		tee /tmp/golangci-lint.lint
 	@test ! -s /tmp/golangci-lint.lint
 .PHONY: lint-go
diff --git a/src/maasagent/.gitignore b/src/maasagent/.gitignore
index c2b1d37..bb778ea 100644
--- a/src/maasagent/.gitignore
+++ b/src/maasagent/.gitignore
@@ -20,5 +20,4 @@ vendor/
 # BINDIR used for various tools
 bin/
 
-# DISTDIR
-dist/
+build/