From 5601c57059500d6ca3f4d342bf152cbd34c2a9c4 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 5 Mar 2020 09:22:41 +0000 Subject: [PATCH] Improve makefile to enable goproxy when go get tools. (#98) makefile go mod always enable GO111MODULE=on Reviewed-on: https://gitea.com/gitea/tea/pulls/98 Reviewed-by: 6543 <6543@noreply.gitea.io> Reviewed-by: Andrew Thornton --- Makefile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 9270ee3..e970cdf 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DIST := dist IMPORT := code.gitea.io/tea -export GO111MODULE=off +export GO111MODULE=on GO ?= go SED_INPLACE := sed -i @@ -59,7 +59,7 @@ all: build .PHONY: clean clean: - $(GO) clean -i ./... + $(GO) clean -mod=vendor -i ./... rm -rf $(EXECUTABLE) $(DIST) .PHONY: fmt @@ -68,26 +68,26 @@ fmt: .PHONY: vet vet: - $(GO) vet $(PACKAGES) + $(GO) vet -mod=vendor $(PACKAGES) .PHONY: lint lint: @hash revive > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - $(GO) get -u github.com/mgechev/revive; \ + cd /tmp && $(GO) get -u github.com/mgechev/revive; \ fi revive -config .revive.toml -exclude=./vendor/... ./... || exit 1 .PHONY: misspell-check misspell-check: @hash misspell > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - $(GO) get -u github.com/client9/misspell/cmd/misspell; \ + cd /tmp && $(GO) get -u github.com/client9/misspell/cmd/misspell; \ fi misspell -error -i unknwon,destory $(GOFILES) .PHONY: misspell misspell: @hash misspell > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - $(GO) get -u github.com/client9/misspell/cmd/misspell; \ + cd /tmp && $(GO) get -u github.com/client9/misspell/cmd/misspell; \ fi misspell -w -i unknwon $(GOFILES) @@ -103,15 +103,15 @@ fmt-check: .PHONY: test test: - GO111MODULE=on $(GO) test -mod=vendor -tags='sqlite sqlite_unlock_notify' $(PACKAGES) + $(GO) test -mod=vendor -tags='sqlite sqlite_unlock_notify' $(PACKAGES) .PHONY: unit-test-coverage unit-test-coverage: - $(GO) test -tags='sqlite sqlite_unlock_notify' -cover -coverprofile coverage.out $(PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1 + $(GO) test -mod=vendor -tags='sqlite sqlite_unlock_notify' -cover -coverprofile coverage.out $(PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1 .PHONY: vendor vendor: - GO111MODULE=on $(GO) mod tidy && GO111MODULE=on $(GO) mod vendor + $(GO) mod tidy && $(GO) mod vendor .PHONY: test-vendor test-vendor: vendor @@ -133,7 +133,7 @@ install: $(wildcard *.go) build: $(EXECUTABLE) $(EXECUTABLE): $(SOURCES) - GO111MODULE=on $(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@ + $(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@ .PHONY: release release: release-dirs release-windows release-linux release-darwin release-copy release-compress release-check @@ -145,7 +145,7 @@ release-dirs: .PHONY: release-windows release-windows: @hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - $(GO) get -u src.techknowlogick.com/xgo; \ + cd /tmp && $(GO) get -u src.techknowlogick.com/xgo; \ fi xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out tea-$(VERSION) . ifeq ($(CI),drone) @@ -155,7 +155,7 @@ endif .PHONY: release-linux release-linux: @hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - $(GO) get -u src.techknowlogick.com/xgo; \ + cd /tmp && $(GO) get -u src.techknowlogick.com/xgo; \ fi xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64,linux/mips64le,linux/mips,linux/mipsle' -out tea-$(VERSION) . ifeq ($(CI),drone) @@ -165,7 +165,7 @@ endif .PHONY: release-darwin release-darwin: @hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - $(GO) get -u src.techknowlogick.com/xgo; \ + cd /tmp && $(GO) get -u src.techknowlogick.com/xgo; \ fi xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out tea-$(VERSION) . ifeq ($(CI),drone) @@ -179,7 +179,7 @@ release-copy: .PHONY: release-compress release-compress: @hash gxz > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - $(GO) get -u github.com/ulikunitz/xz/cmd/gxz; \ + cd /tmp && $(GO) get -u github.com/ulikunitz/xz/cmd/gxz; \ fi cd $(DIST)/release/; for file in `find . -type f -name "*"`; do echo "compressing $${file}" && gxz -k -9 $${file}; done;