Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Update makefile #1770

Merged
merged 3 commits into from
Jul 25, 2022
Merged

chore: Update makefile #1770

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8544527
remove unused tools, remove incorrect import formatting
colin-axner Jul 25, 2022
810c6c4
uncomment command in makefile
colin-axner Jul 25, 2022
17d9af5
Merge branch 'main' into colin/fix-makefile
colin-axner Jul 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ ifeq (,$(findstring nostrip,$(COSMOS_BUILD_OPTIONS)))
BUILD_FLAGS += -trimpath
endif

all: tools build lint test
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tools and tools-clean no longer exist

all: build lint test

# The below include contains the tools and runsim targets.
#include contrib/devtools/Makefile
Expand Down Expand Up @@ -156,7 +156,7 @@ mocks: $(MOCKS_DIR)
$(MOCKS_DIR):
mkdir -p $(MOCKS_DIR)

distclean: clean tools-clean
distclean: clean
clean:
rm -rf \
$(BUILDDIR)/ \
Expand Down Expand Up @@ -337,10 +337,9 @@ lint-fix:
golangci-lint run --fix --out-format=tab --issues-exit-code=0
.PHONY: lint lint-fix

format:
format: goimports
find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -path "./tests/mocks/*" -not -name '*.pb.go' | xargs gofmt -w -s
find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -path "./tests/mocks/*" -not -name '*.pb.go' | xargs misspell -w
colin-axner marked this conversation as resolved.
Show resolved Hide resolved
find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -path "./tests/mocks/*" -not -name '*.pb.go' | xargs goimports -w -local github.com/cosmos/cosmos-sdk
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was causing sdk imports to be after standard and external imports (copied over when this repo was created)

.PHONY: format

goimports:
Expand Down