Makefile: Reformat imports when running "make fmt-go"

This commit is contained in:
Michael Mayer 2021-08-14 18:18:25 +02:00
parent 5ea6f70938
commit c7e28d688f

View file

@ -1,5 +1,5 @@
.PHONY: all build dev npm dep dep-go dep-js dep-list dep-tensorflow dep-upgrade dep-upgrade-js \ .PHONY: all build dev npm dep dep-go dep-js dep-list dep-tensorflow dep-upgrade dep-upgrade-js \
test test-js test-go install generate fmt fmt-go fmt-imports fmt-js upgrade start stop \ test test-js test-go install generate fmt fmt-go fmt-js upgrade start stop \
terminal root-terminal packer-digitalocean acceptance clean tidy; terminal root-terminal packer-digitalocean acceptance clean tidy;
.SILENT: ; # no need for @ .SILENT: ; # no need for @
.ONESHELL: ; # recipes execute in same shell .ONESHELL: ; # recipes execute in same shell
@ -36,7 +36,7 @@ acceptance-public-run-firefox: acceptance-restart acceptance-firefox acceptance-
acceptance-run-chromium: acceptance-private-restart acceptance-private acceptance-private-stop acceptance-restart acceptance acceptance-stop acceptance-run-chromium: acceptance-private-restart acceptance-private acceptance-private-stop acceptance-restart acceptance acceptance-stop
acceptance-run-firefox: acceptance-private-restart acceptance-private-firefox acceptance-private-stop acceptance-restart acceptance-firefox acceptance-stop acceptance-run-firefox: acceptance-private-restart acceptance-private-firefox acceptance-private-stop acceptance-restart acceptance-firefox acceptance-stop
test-all: test acceptance-run-chromium test-all: test acceptance-run-chromium
fmt: fmt-js fmt-go fmt-imports fmt: fmt-js fmt-go
upgrade: dep-upgrade-js dep-upgrade upgrade: dep-upgrade-js dep-upgrade
clean-local: clean-local-config clean-local-cache clean-local: clean-local-config clean-local-cache
clean-install: clean-local dep build-js install-bin install-assets clean-install: clean-local dep build-js install-bin install-assets
@ -226,9 +226,8 @@ lint-js:
(cd frontend && npm run lint) (cd frontend && npm run lint)
fmt-js: fmt-js:
(cd frontend && npm run fmt) (cd frontend && npm run fmt)
fmt-imports:
goimports -w pkg internal cmd
fmt-go: fmt-go:
go fmt ./pkg/... ./internal/... ./cmd/... go fmt ./pkg/... ./internal/... ./cmd/...
goimports -w pkg internal cmd
tidy: tidy:
go mod tidy go mod tidy