From bc592c55c1c1ace7f79a720d7139465c62cd95ca Mon Sep 17 00:00:00 2001 From: Yogesh Deshpande Date: Fri, 15 Mar 2024 06:20:59 -0400 Subject: [PATCH] Re-try Signed-off-by: Yogesh Deshpande --- .github/workflows/ci.yml | 2 +- mk/common.mk | 3 +-- mk/test.mk | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c668d06c..97eed6e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,4 +40,4 @@ jobs: - name: Run tests run: | go version - make -w test ${{env.CITEST}} + make -w test diff --git a/mk/common.mk b/mk/common.mk index 45a576da..77ce5396 100644 --- a/mk/common.mk +++ b/mk/common.mk @@ -5,8 +5,7 @@ SHELL := /bin/bash # Pass this to sub-make export GO111MODULE := on -CITEST=-g -export CITEST +export CI # 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 769b187c..48375dae 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 ($(CITEST),true) +ifeq ($(CI),true) COPYRIGHT_FLAGS += --no-year-check endif