build-sys: update build sys to darvaza.org/x's latest
Signed-off-by: Alejandro Mery <amery@jpi.io>
This commit is contained in:
@@ -6,20 +6,20 @@ GOFMT ?= gofmt
|
||||
GOFMT_FLAGS = -w -l -s
|
||||
GOGENERATE_FLAGS = -v
|
||||
|
||||
GOPATH ?= $(shell $(GO) env GOPATH)
|
||||
GOBIN ?= $(GOPATH)/bin
|
||||
|
||||
TOOLSDIR := $(CURDIR)/pkg/tools
|
||||
TMPDIR ?= .tmp
|
||||
TMPDIR ?= $(CURDIR)/.tmp
|
||||
OUTDIR ?= $(TMPDIR)
|
||||
|
||||
GOLANGCI_LINT_VERSION ?= v1.59.1
|
||||
REVIVE_VERSION ?= v1.3.7
|
||||
|
||||
GOLANGCI_LINT_URL ?= github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
|
||||
GOLANGCI_LINT ?= $(GO) run $(GOLANGCI_LINT_URL)
|
||||
|
||||
REVIVE ?= $(GOBIN)/revive
|
||||
REVIVE_CONF ?= $(TOOLSDIR)/revive.toml
|
||||
REVIVE_RUN_ARGS ?= -config $(REVIVE_CONF) -formatter friendly
|
||||
REVIVE_VERSION ?= v1.3.7
|
||||
REVIVE_INSTALL_URL ?= github.com/mgechev/revive@$(REVIVE_VERSION)
|
||||
|
||||
GO_INSTALL_URLS = \
|
||||
$(REVIVE_INSTALL_URL) \
|
||||
REVIVE_URL ?= github.com/mgechev/revive@$(REVIVE_VERSION)
|
||||
REVIVE ?= $(GO) run $(REVIVE_URL)
|
||||
|
||||
V = 0
|
||||
Q = $(if $(filter 1,$V),,@)
|
||||
@@ -30,12 +30,13 @@ GO_BUILD_CMD = $(GO_BUILD) -o "$(OUTDIR)"
|
||||
|
||||
all: get generate tidy build
|
||||
|
||||
install:
|
||||
$Q $(GO) install -v ./cmd/...
|
||||
|
||||
clean: ; $(info $(M) cleaning…)
|
||||
rm -rf $(TMPDIR)
|
||||
|
||||
install: ; $(info $(M) cleaning…)
|
||||
$Q $(GO) install -v ./cmd/...
|
||||
|
||||
|
||||
$(TMPDIR)/index: $(TOOLSDIR)/gen_index.sh Makefile FORCE ; $(info $(M) generating index…)
|
||||
$Q mkdir -p $(@D)
|
||||
$Q $< > $@~
|
||||
@@ -55,6 +56,3 @@ tidy: fmt
|
||||
|
||||
generate: ; $(info $(M) running go:generate…)
|
||||
$Q git grep -l '^//go:generate' | sort -uV | xargs -r -n1 $(GO) generate $(GOGENERATE_FLAGS)
|
||||
|
||||
$(REVIVE):
|
||||
$Q $(GO) install -v $(REVIVE_INSTALL_URL)
|
||||
|
||||
Reference in New Issue
Block a user