Use comma separated build tags

Also fixup the compat test image selection
hashicorp · Jan 31, 2025 · 5667a37 · 5667a37
1 parent 3b1f5e3
commit 5667a37
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -27,7 +27,11 @@ GCI_VERSION='v0.11.2'
 MOCKED_PB_DIRS= pbdns
 
 GOTAGS ?=
-GOTAGS+= hashicorpmetrics
+ifeq ("$(GOTAGS)","")
+GOTAGS:=hashicorpmetrics
+else
+GOTAGS:=hashicorpmetrics,$(GOTAGS)
+endif
 GOPATH=$(shell go env GOPATH)
 GOARCH?=$(shell go env GOARCH)
 MAIN_GOPATH=$(shell go env GOPATH | cut -d: -f1)
@@ -58,10 +62,10 @@ else
 QUIET=
 endif
 
-ifeq ("$(GOTAGS)","")
-CONSUL_COMPAT_TEST_IMAGE=hashicorp/consul
-else
+ifeq ($(findstring consulent,$(GOTAGS)),consulent)
 CONSUL_COMPAT_TEST_IMAGE=hashicorp/consul-enterprise
+else
+CONSUL_COMPAT_TEST_IMAGE=hashicorp/consul
 endif
 
 CONSUL_DEV_IMAGE?=consul-dev