From 7c3b16686ae3a1e3ff57f5a19d862dbd5e186ba1 Mon Sep 17 00:00:00 2001 From: Yogesh Deshpande Date: Fri, 15 Mar 2024 05:47:24 -0400 Subject: [PATCH] More attempt to fix Signed-off-by: Yogesh Deshpande --- .github/workflows/ci.yml | 2 +- mk/common.mk | 1 + mk/test.mk | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 91f206a7..a560805f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,4 +40,4 @@ jobs: - name: Run tests run: | go version - make -w CITEST=$(CITEST) test + make -w test CITEST=$(CITEST) diff --git a/mk/common.mk b/mk/common.mk index c174a88e..45a576da 100644 --- a/mk/common.mk +++ b/mk/common.mk @@ -5,6 +5,7 @@ SHELL := /bin/bash # Pass this to sub-make export GO111MODULE := on +CITEST=-g export CITEST # Used to set the ServerVersion reported by services diff --git a/mk/test.mk b/mk/test.mk index edc390e9..769b187c 100644 --- a/mk/test.mk +++ b/mk/test.mk @@ -11,6 +11,7 @@ TEST_ARGS ?= -v -cover -race MOCKGEN := $(shell go env GOPATH)/bin/mockgen +CITEST?=false define MOCK_template mock_$(1): $(1)