avoid assuming $GOPATH is set (#55)
Assign `$GOPATH` if not set, and use same to get to `$GOPATH/bin` instead of assuming `$PATH` contains same.
This commit is contained in:
parent
0f24f27f20
commit
7399e616d6
1 changed files with 3 additions and 2 deletions
5
Makefile
5
Makefile
|
@ -2,6 +2,7 @@ GO ?= $(shell command -v go 2> /dev/null)
|
||||||
NPM ?= $(shell command -v npm 2> /dev/null)
|
NPM ?= $(shell command -v npm 2> /dev/null)
|
||||||
CURL ?= $(shell command -v curl 2> /dev/null)
|
CURL ?= $(shell command -v curl 2> /dev/null)
|
||||||
MANIFEST_FILE ?= plugin.json
|
MANIFEST_FILE ?= plugin.json
|
||||||
|
GOPATH ?= $(shell go env GOPATH)
|
||||||
GO_TEST_FLAGS ?= -race
|
GO_TEST_FLAGS ?= -race
|
||||||
GO_BUILD_FLAGS ?=
|
GO_BUILD_FLAGS ?=
|
||||||
MM_UTILITIES_DIR ?= ../mattermost-utilities
|
MM_UTILITIES_DIR ?= ../mattermost-utilities
|
||||||
|
@ -63,7 +64,7 @@ endif
|
||||||
govet:
|
govet:
|
||||||
ifneq ($(HAS_SERVER),)
|
ifneq ($(HAS_SERVER),)
|
||||||
@echo Running govet
|
@echo Running govet
|
||||||
@# Workaroung because you can't install binaries without adding them to go.mod
|
@# Workaround because you can't install binaries without adding them to go.mod
|
||||||
env GO111MODULE=off $(GO) get golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow
|
env GO111MODULE=off $(GO) get golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow
|
||||||
$(GO) vet ./...
|
$(GO) vet ./...
|
||||||
$(GO) vet -vettool=$(GOPATH)/bin/shadow ./...
|
$(GO) vet -vettool=$(GOPATH)/bin/shadow ./...
|
||||||
|
@ -75,7 +76,7 @@ endif
|
||||||
golint:
|
golint:
|
||||||
@echo Running lint
|
@echo Running lint
|
||||||
env GO111MODULE=off $(GO) get golang.org/x/lint/golint
|
env GO111MODULE=off $(GO) get golang.org/x/lint/golint
|
||||||
golint -set_exit_status ./...
|
$(GOPATH)/bin/golint -set_exit_status ./...
|
||||||
@echo lint success
|
@echo lint success
|
||||||
|
|
||||||
## Builds the server, if it exists, including support for multiple architectures.
|
## Builds the server, if it exists, including support for multiple architectures.
|
||||||
|
|
Reference in a new issue