chore: remove GO111MODULE=on from Makefile
parent
dbe657dc0b
commit
d2279e8afa
15
Makefile
15
Makefile
|
@ -19,7 +19,6 @@ unexport TMP_BUILD_VERSION
|
||||||
|
|
||||||
BINARY=chronograf
|
BINARY=chronograf
|
||||||
CTLBINARY=chronoctl
|
CTLBINARY=chronoctl
|
||||||
GO111MODULE=on
|
|
||||||
|
|
||||||
.DEFAULT_GOAL := all
|
.DEFAULT_GOAL := all
|
||||||
|
|
||||||
|
@ -30,8 +29,8 @@ all: dep build
|
||||||
build: assets ${BINARY}
|
build: assets ${BINARY}
|
||||||
|
|
||||||
${BINARY}: $(SOURCES) .bindata .jsdep .godep
|
${BINARY}: $(SOURCES) .bindata .jsdep .godep
|
||||||
GO111MODULE=on go build -o ${BINARY} ${LDFLAGS} ./cmd/chronograf/main.go
|
go build -o ${BINARY} ${LDFLAGS} ./cmd/chronograf/main.go
|
||||||
GO111MODULE=on go build -o ${CTLBINARY} ${LDFLAGS} ./cmd/chronoctl
|
go build -o ${CTLBINARY} ${LDFLAGS} ./cmd/chronoctl
|
||||||
|
|
||||||
define CHRONOGIRAFFE
|
define CHRONOGIRAFFE
|
||||||
._ o o
|
._ o o
|
||||||
|
@ -48,7 +47,7 @@ chronogiraffe: ${BINARY}
|
||||||
@echo "$$CHRONOGIRAFFE"
|
@echo "$$CHRONOGIRAFFE"
|
||||||
|
|
||||||
docker-${BINARY}: $(SOURCES)
|
docker-${BINARY}: $(SOURCES)
|
||||||
CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -installsuffix cgo -o ${BINARY} ${LDFLAGS} \
|
CGO_ENABLED=0 GOOS=linux go build -installsuffix cgo -o ${BINARY} ${LDFLAGS} \
|
||||||
./cmd/chronograf/main.go
|
./cmd/chronograf/main.go
|
||||||
|
|
||||||
docker: dep assets docker-${BINARY}
|
docker: dep assets docker-${BINARY}
|
||||||
|
@ -66,7 +65,7 @@ assets: .jssrc .bindata
|
||||||
dep: .jsdep .godep
|
dep: .jsdep .godep
|
||||||
|
|
||||||
.godep:
|
.godep:
|
||||||
GO111MODULE=on go get
|
go get
|
||||||
@touch .godep
|
@touch .godep
|
||||||
|
|
||||||
.jsdep: ./yarn.lock
|
.jsdep: ./yarn.lock
|
||||||
|
@ -80,7 +79,7 @@ endif
|
||||||
gen: internal.pb.go
|
gen: internal.pb.go
|
||||||
|
|
||||||
internal.pb.go: kv/internal/internal.proto
|
internal.pb.go: kv/internal/internal.proto
|
||||||
GO111MODULE=on go generate -x ./kv/internal
|
go generate -x ./kv/internal
|
||||||
|
|
||||||
test: gochecktidy gocheckfmt jstest gotest gotestrace lint-ci
|
test: gochecktidy gocheckfmt jstest gotest gotestrace lint-ci
|
||||||
|
|
||||||
|
@ -101,10 +100,10 @@ gocheckfmt:
|
||||||
fi
|
fi
|
||||||
|
|
||||||
gotest:
|
gotest:
|
||||||
GO111MODULE=on go test -timeout 10s ./...
|
go test -timeout 10s ./...
|
||||||
|
|
||||||
gotestrace:
|
gotestrace:
|
||||||
GO111MODULE=on go test -race ./...
|
go test -race ./...
|
||||||
|
|
||||||
jstest:
|
jstest:
|
||||||
cd ui && yarn test --runInBand
|
cd ui && yarn test --runInBand
|
||||||
|
|
Loading…
Reference in New Issue