Version tags now reflect mod/vendor build setup.

Switched 'make lint' to use golangci-lint as gometalinter is deprecated.

Signed-off-by: Russ Magee <rmagee@gmail.com>
This commit is contained in:
Russ Magee 2020-01-30 12:40:18 -08:00
parent 2a6663ed3c
commit ce5cfef6d5
4 changed files with 17 additions and 11 deletions

View file

@ -1,22 +1,28 @@
.PHONY: lint vis clean common client server passwd subpkgs install uninstall reinstall
#ifeq ($(MAKEOPTS),)
MAKEOPTS = $(MAKEOPTS)
#endif
GIT_COMMIT := $(shell git rev-list -1 HEAD)
VERSION := 0.8.12
## Tag version of binaries with build info wrt.
## GO111MODULE(=on) and vendor/ setup vs. $GOPATH pkg builds
############################################################
ifeq ($(shell go env GOMOD),)
MTAG=
else
MTAG="-m"
endif
ifneq ($(VENDOR),)
GOBUILDOPTS :=-v -mod vendor
VTAG = "-vendor"
VTAG = "-v"
else
GOBUILDOPTS=
VTAG =
endif
############################################################
GIT_COMMIT := $(shell git rev-list -1 HEAD)
VERSION := 0.8.12
#ifeq ($(BUILDOPTS),)
BUILDOPTS :=$(BUILDOPTS)"$(GOBUILDOPTS) -ldflags \"-X main.version=$(VERSION)$(VTAG) -X main.gitCommit=$(GIT_COMMIT)\""
BUILDOPTS :=$(BUILDOPTS)"$(GOBUILDOPTS) -ldflags \"-X main.version=$(VERSION)$(MTAG)$(VTAG) -X main.gitCommit=$(GIT_COMMIT)\""
#endif
SUBPKGS = logger spinsult xsnet

View file

@ -15,4 +15,4 @@ vis:
../fixup-gv.sh xs.go && cat xs-vis.gv | dot -Tpng -oxs-vis-fixedup.png
lint:
-gometalinter --deadline=60s | sort
-golangci-lint run

View file

@ -14,5 +14,5 @@ vis:
../fixup-gv.sh xsd.go && cat xsd-vis.gv | dot -Tpng -oxsd-vis-fixedup.png
lint:
-gometalinter --deadline=60s | sort
-golangci-lint run

View file

@ -13,4 +13,4 @@ vis:
go-callvis -format png -file xspasswd-vis -ignore $(EXTPKGS) -group pkg,type .
lint:
-gometalinter --deadline=60s | sort
-golangci-lint run