From 06bcacabc10c2ed3becc6b36f111f8a085b95d8a Mon Sep 17 00:00:00 2001 From: tycho garen Date: Fri, 1 Oct 2021 13:14:35 -0400 Subject: [PATCH] buildsystem fixes --- Makefile | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 6f7a926cf3c2..774bd15f3b03 100644 --- a/Makefile +++ b/Makefile @@ -117,33 +117,10 @@ $(BUILD_TARGETS): go.sum $(BUILDDIR)/ $(BUILDDIR)/: mkdir -p $(BUILDDIR)/ -build-simd-all: go.sum - $(DOCKER) rm latest-build || true - $(DOCKER) run --volume=$(CURDIR):/sources:ro \ - --env TARGET_PLATFORMS='linux/amd64 darwin/amd64 linux/arm64 windows/amd64' \ - --env APP=simd \ - --env VERSION=$(VERSION) \ - --env COMMIT=$(COMMIT) \ - --env LEDGER_ENABLED=$(LEDGER_ENABLED) \ - --name latest-build cosmossdk/rbuilder:latest - $(DOCKER) cp -a latest-build:/home/builder/artifacts/ $(CURDIR)/ - -build-simd-linux: go.sum $(BUILDDIR)/ - $(DOCKER) rm latest-build || true - $(DOCKER) run --volume=$(CURDIR):/sources:ro \ - --env TARGET_PLATFORMS='linux/amd64' \ - --env APP=simd \ - --env VERSION=$(VERSION) \ - --env COMMIT=$(COMMIT) \ - --env LEDGER_ENABLED=false \ - --name latest-build cosmossdk/rbuilder:latest - $(DOCKER) cp -a latest-build:/home/builder/artifacts/ $(CURDIR)/ - cp artifacts/simd-*-linux-amd64 $(BUILDDIR)/simd - cosmovisor: $(MAKE) -C cosmovisor cosmovisor -.PHONY: build build-linux build-simd-all build-simd-linux cosmovisor +.PHONY: build build-linux cosmovisor mockgen_cmd=go run github.com/golang/mock/mockgen @@ -354,7 +331,7 @@ lint-fix: @if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerMarkdownLintFix}$$"; then docker start -a $(containerMarkdownLintFix); else docker run --name $(containerMarkdownLintFix) -i -v "$(CURDIR):/work" $(markdownLintImage) . --fix; fi lint-go: - $(golangci_lint_cmd) run --out-format=tab --timeout=5m + $(golangci_lint_cmd) run --out-format=tab --timeout=10m .PHONY: lint lint-fix