diff --git a/mk/common.mk b/mk/common.mk index 77ce5396..1b9aa713 100644 --- a/mk/common.mk +++ b/mk/common.mk @@ -5,7 +5,7 @@ SHELL := /bin/bash # Pass this to sub-make export GO111MODULE := on -export CI +#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 883dce89..25bf1466 100644 --- a/mk/test.mk +++ b/mk/test.mk @@ -51,7 +51,7 @@ check-mockgen: realtest: _mocks ; go test $(TEST_ARGS) $(GOPKG) .PHONY: realtest -ifeq ($(CI),true) +ifdef CITEST COPYRIGHT_FLAGS += --no-year-check endif