From 00b01bd3ee707580cfe3ef3d15452f32e9a67ccc Mon Sep 17 00:00:00 2001 From: faneaatiku Date: Thu, 9 Nov 2023 22:00:45 +0200 Subject: [PATCH] remove linter from makefile and fixed cross compiling --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index ee21164..6c8507f 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ COMMIT := $(shell git log -1 --format='%H') NETWORK ?= mainnet COVERAGE ?= coverage.txt BUILDDIR ?= $(CURDIR)/build -LEDGER_ENABLED ?= true +LEDGER_ENABLED ?= false ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=bze \ -X github.com/cosmos/cosmos-sdk/version.AppName=bzed \ @@ -54,16 +54,16 @@ build-win64: check-version check-network go.sum build-linux: check-version check-network go.sum ifeq ($(OS), Linux) - GOOS=linux GOARCH=amd64 $(MAKE) build + GOOS=linux GOARCH=amd64 go build -mod=readonly $(BUILD_FLAGS) $(BUILD_TAGS) -o $(BUILDDIR)/linux-amd64/bzed ./cmd/bzed else - LEDGER_ENABLED=false GOOS=linux GOARCH=amd64 $(MAKE) build + LEDGER_ENABLED=false GOOS=linux GOARCH=amd64 go build -mod=readonly $(BUILD_FLAGS) $(BUILD_TAGS) -o $(BUILDDIR)/linux-amd64/bzed ./cmd/bzed endif build-linux-arm64: check-version check-network go.sum ifeq ($(OS), Linux) - GOOS=linux GOARCH=arm64 $(MAKE) build + GOOS=linux GOARCH=arm64 go build -mod=readonly $(BUILD_FLAGS) $(BUILD_TAGS) -o $(BUILDDIR)/linux-arm64/bzed ./cmd/bzed else - LEDGER_ENABLED=false GOOS=linux GOARCH=arm64 $(MAKE) build + LEDGER_ENABLED=false GOOS=linux GOARCH=arm64 go build -mod=readonly $(BUILD_FLAGS) $(BUILD_TAGS) -o $(BUILDDIR)/linux-arm64/bzed ./cmd/bzed endif build-mac: check-version check-network go.sum @@ -75,9 +75,9 @@ endif build-mac-arm64: check-version check-network go.sum ifeq ($(OS), Darwin) - LEDGER_ENABLED=false GOOS=darwin GOARCH=arm64 $(MAKE) build + LEDGER_ENABLED=false GOOS=darwin GOARCH=arm64 go build -mod=readonly $(BUILD_FLAGS) $(BUILD_TAGS) -o $(BUILDDIR)/darwin-arm64/bzed ./cmd/bzed else - LEDGER_ENABLED=false GOOS=darwin GOARCH=arm64 $(MAKE) build + LEDGER_ENABLED=false GOOS=darwin GOARCH=arm64 go build -mod=readonly $(BUILD_FLAGS) $(BUILD_TAGS) -o $(BUILDDIR)/darwin-arm64/bzed ./cmd/bzed endif build-all: check-version lint all build-win64 build-mac build-mac-arm64 build-linux build-linux-arm64 compress-build @@ -101,9 +101,9 @@ test: check-network # look into .golangci.yml for enabling / disabling linters lint: - @echo "--> Running linter" - @golangci-lint run - @go mod verify + @#echo "--> Running linter" + @#golangci-lint run + @#go mod verify # a trick to make all the lint commands execute, return error when at least one fails. # golangci-lint is run in standalone job in ci