Skip to content

Commit

Permalink
Revert "Revert "Set GO111MODULE for go and promu commands, so that th…
Browse files Browse the repository at this point in the history
…ey work under GOPATH. (#158)" (#166)"

This reverts commit 92d4183.
  • Loading branch information
qingling128 authored Sep 9, 2019
1 parent de9073f commit 72e4b1b
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,23 +67,23 @@ endif

test-short:
@echo ">> running short tests"
$(GO) test -short $(GOOPTS) $(pkgs)
GO111MODULE=$(GO111MODULE) $(GO) test -short $(GOOPTS) $(pkgs)

test:
@echo ">> running all tests"
$(GO) test $(GOOPTS) $(pkgs)
GO111MODULE=$(GO111MODULE) $(GO) test $(GOOPTS) $(pkgs)

cover:
@echo ">> running all tests with coverage"
$(GO) test -coverprofile=coverage.out $(GOOPTS) $(pkgs)
GO111MODULE=$(GO111MODULE) $(GO) test -coverprofile=coverage.out $(GOOPTS) $(pkgs)

format:
@echo ">> formatting code"
$(GO) fmt $(pkgs)
GO111MODULE=$(GO111MODULE) $(GO) fmt $(pkgs)

vet:
@echo ">> vetting code"
$(GO) vet $(GOOPTS) $(pkgs)
GO111MODULE=$(GO111MODULE) $(GO) vet $(GOOPTS) $(pkgs)

staticcheck: $(STATICCHECK)
@echo ">> running staticcheck"
Expand All @@ -98,11 +98,11 @@ endif

build: promu
@echo ">> building binaries"
$(PROMU) build --prefix $(PREFIX)
GO111MODULE=$(GO111MODULE) $(PROMU) build --prefix $(PREFIX)

build-linux-amd64: promu
@echo ">> building linux amd64 binaries"
@GOOS=linux GOARCH=amd64 $(PROMU) build --prefix $(PREFIX)
@GO111MODULE=$(GO111MODULE) GOOS=linux GOARCH=amd64 $(PROMU) build --prefix $(PREFIX)

tarball: promu
@echo ">> building release tarball"
Expand Down

0 comments on commit 72e4b1b

Please sign in to comment.