diff --git a/mk/common.mk b/mk/common.mk index c174a88e..387bd24c 100644 --- a/mk/common.mk +++ b/mk/common.mk @@ -5,7 +5,6 @@ SHELL := /bin/bash # Pass this to sub-make export GO111MODULE := on -export CITEST # Used to set the ServerVersion reported by services VERSION_FROM_GIT := $(shell git describe --tags --exact-match 2>/dev/null || echo -n "commit-$(shell git rev-parse --revs-only --short HEAD)") diff --git a/mk/test.mk b/mk/test.mk index 25bf1466..73e566f2 100644 --- a/mk/test.mk +++ b/mk/test.mk @@ -11,7 +11,7 @@ TEST_ARGS ?= -v -cover -race MOCKGEN := $(shell go env GOPATH)/bin/mockgen -CI?=false +COPYRIGHT_FLAGS ?= define MOCK_template mock_$(1): $(1) @@ -55,7 +55,7 @@ ifdef CITEST COPYRIGHT_FLAGS += --no-year-check endif -checkcopyrights: ; env; python3 $(THIS_DIR)../scripts/check-copyright $(COPYRIGHT_FLAGS) . +checkcopyrights: ; python3 $(THIS_DIR)../scripts/check-copyright $(COPYRIGHT_FLAGS) . .PHONY: checkcopyrights CLEANFILES += $(MOCK_FILES)