Enable Go module support across all commands. (#717)
This commit is contained in:
parent
a653032409
commit
358ce7c20c
20
Makefile
20
Makefile
@ -1,6 +1,9 @@
|
|||||||
.DEFAULT_GOAL = test
|
.DEFAULT_GOAL = test
|
||||||
.PHONY: FORCE
|
.PHONY: FORCE
|
||||||
|
|
||||||
|
# Enable Go module support across all commands.
|
||||||
|
export GO111MODULE = on
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
|
|
||||||
fast_build: FORCE
|
fast_build: FORCE
|
||||||
@ -14,15 +17,12 @@ clean:
|
|||||||
.PHONY: fast_build build build_race clean
|
.PHONY: fast_build build build_race clean
|
||||||
|
|
||||||
# Test
|
# Test
|
||||||
test: export GO111MODULE = on
|
|
||||||
test: export GOLANGCI_LINT_INSTALLED = true
|
test: export GOLANGCI_LINT_INSTALLED = true
|
||||||
|
|
||||||
test: build
|
test: build
|
||||||
GL_TEST_RUN=1 time ./golangci-lint run -v
|
GL_TEST_RUN=1 time ./golangci-lint run -v
|
||||||
GL_TEST_RUN=1 time ./golangci-lint run --fast --no-config -v --skip-dirs 'test/testdata_etc,internal/(cache|renameio|robustio)'
|
GL_TEST_RUN=1 time ./golangci-lint run --fast --no-config -v --skip-dirs 'test/testdata_etc,internal/(cache|renameio|robustio)'
|
||||||
GL_TEST_RUN=1 time ./golangci-lint run --no-config -v --skip-dirs 'test/testdata_etc,internal/(cache|renameio|robustio)'
|
GL_TEST_RUN=1 time ./golangci-lint run --no-config -v --skip-dirs 'test/testdata_etc,internal/(cache|renameio|robustio)'
|
||||||
GL_TEST_RUN=1 time go test -v ./...
|
GL_TEST_RUN=1 time go test -v ./...
|
||||||
|
|
||||||
.PHONY: test
|
.PHONY: test
|
||||||
|
|
||||||
test_race:
|
test_race:
|
||||||
@ -69,19 +69,19 @@ golangci-lint: FORCE pkg/logutils/mock_logutils/mock_log.go
|
|||||||
go build -o $@ ./cmd/golangci-lint
|
go build -o $@ ./cmd/golangci-lint
|
||||||
|
|
||||||
tools/mockgen: go.mod go.sum
|
tools/mockgen: go.mod go.sum
|
||||||
GOBIN=$(CURDIR)/tools GO111MODULE=on go install github.com/golang/mock/mockgen
|
GOBIN=$(CURDIR)/tools go install github.com/golang/mock/mockgen
|
||||||
|
|
||||||
tools/goimports: go.mod go.sum
|
tools/goimports: go.mod go.sum
|
||||||
GOBIN=$(CURDIR)/tools GO111MODULE=on go install golang.org/x/tools/cmd/goimports
|
GOBIN=$(CURDIR)/tools go install golang.org/x/tools/cmd/goimports
|
||||||
|
|
||||||
tools/go.mod:
|
tools/go.mod:
|
||||||
@mkdir -p tools
|
@mkdir -p tools
|
||||||
@rm -f $@
|
@rm -f $@
|
||||||
cd tools && GO111MODULE=on go mod init local-tools
|
cd tools && go mod init local-tools
|
||||||
|
|
||||||
tools/godownloader: Makefile tools/go.mod
|
tools/godownloader: Makefile tools/go.mod
|
||||||
# https://github.com/goreleaser/godownloader/issues/133
|
# https://github.com/goreleaser/godownloader/issues/133
|
||||||
cd tools && GOBIN=$(CURDIR)/tools GO111MODULE=off go get -u github.com/goreleaser/godownloader
|
cd tools && GOBIN=$(CURDIR)/tools go get -u github.com/goreleaser/godownloader
|
||||||
|
|
||||||
tools/svg-term:
|
tools/svg-term:
|
||||||
@mkdir -p tools
|
@mkdir -p tools
|
||||||
@ -106,11 +106,11 @@ pkg/logutils/mock_logutils/mock_log.go: tools/mockgen tools/goimports pkg/loguti
|
|||||||
PATH=$(CURDIR)/tools:$${PATH} go generate ./...
|
PATH=$(CURDIR)/tools:$${PATH} go generate ./...
|
||||||
|
|
||||||
go.mod: FORCE
|
go.mod: FORCE
|
||||||
GO111MODULE=on go mod verify
|
go mod tidy
|
||||||
GO111MODULE=on go mod tidy
|
go mod verify
|
||||||
go.sum: go.mod
|
go.sum: go.mod
|
||||||
|
|
||||||
.PHONY: vendor
|
.PHONY: vendor
|
||||||
vendor: go.mod go.sum
|
vendor: go.mod go.sum
|
||||||
rm -rf vendor
|
rm -rf vendor
|
||||||
GO111MODULE=on go mod vendor
|
go mod vendor
|
||||||
|
Loading…
x
Reference in New Issue
Block a user