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

chore(Makefile): fix issue with go run not having modules enabled

pull/10616/head
Nathaniel Cook 2018-12-20 12:17:02 -07:00
parent 7928eb762d
commit b99ede0b76
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -24,6 +24,7 @@ export GO_TEST=env GOTRACEBACK=all GO111MODULE=on go test $(GO_ARGS)
# Do not add GO111MODULE=on to the call to go generate so it doesn't pollute the environment.
export GO_GENERATE=go generate $(GO_ARGS)
export GO_VET=env GO111MODULE=on go vet $(GO_ARGS)
export GO_RUN=env GO111MODULE=on go run $(GO_ARGS)
export PATH := $(PWD)/bin/$(GOOS):$(PATH)
@ -120,7 +121,7 @@ bench:
build: all
nightly: build
env GO111MODULE=on go run github.com/goreleaser/goreleaser --snapshot --rm-dist --publish-snapshots
$(GO_RUN) github.com/goreleaser/goreleaser --snapshot --rm-dist --publish-snapshots
clean:
@for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done

5
http/Makefile
View File

@ -16,8 +16,11 @@ $(SUBDIRS):
clean: $(SUBDIRS)
rm -f $(TARGETS)
GO_RUN := env GO111MODULE=on go run
../ui/src/api/api.ts: $(SOURCES)
cat cur_swagger.yml | go run ../internal/yaml2json > openapi.json
cat cur_swagger.yml | $(GO_RUN) ../internal/yaml2json > openapi.json
openapi-generator generate -g typescript-axios -o ../ui/src/api -i openapi.json
rm openapi.json