Influxdata
/
chronograf
mirror of https://github.com/influxdata/chronograf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: don't use 'go list' to determine if a go application is installed

pull/5388/head
greg linton 2020-02-11 17:42:44 -07:00 committed by Greg
parent 013d594fe5
commit 463f56a57a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -1,12 +1,12 @@
.PHONY: assets dep clean test gotest gotestrace jstest run run-dev ctags
ifeq ($(OS), Windows_NT)
VERSION := $(shell git describe --exact-match --tags 2>nil)
GOBINDATA := $(shell go-bindata.exe --version 2>nil)
else
VERSION := $(shell git describe --exact-match --tags 2>/dev/null)
GOBINDATA := $(shell which go-bindata 2> /dev/null)
endif
COMMIT ?= $(shell git rev-parse --short=8 HEAD)
GOBINDATA := $(shell go list -f {{.Root}} github.com/kevinburke/go-bindata 2> /dev/null)
YARN := $(shell command -v yarn 2> /dev/null)
SOURCES := $(shell find . -name '*.go' ! -name '*_gen.go' -not -path "./vendor/*" )
@ -24,6 +24,8 @@ GO111MODULE=on
.DEFAULT_GOAL := all
.PHONY: assets dep clean test gotest gotestrace jstest run run-dev ctags
all: dep build
build: assets ${BINARY}