Fix mock generation in CI (#11)

jfrog · Dec 6, 2024 · dfc54fd · dfc54fd
1 parent f00ded0
commit dfc54fd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -45,7 +45,8 @@ GOLANGCI_LINT:
 
 ########## BUILD ##########
 prereq::
-	${GOCMD} install github.com/jstemmer/go-junit-report@v1.0.0
+	$(GOCMD) install github.com/jstemmer/go-junit-report@v1.0.0
+	GOBIN=${TOOLS_DIR} $(GOCMD) install go.uber.org/mock/mockgen@v0.5.0
 
 build::
 	go env GOOS GOARCH
@@ -67,7 +68,7 @@ clean-mock:
 .PHONY: generate-mock
 generate-mock: clean-mock
 	@echo Generating test mocks
-	go generate ./...
+	TOOLS_DIR=$(TOOLS_DIR) go generate ./...
 
 test-prereq: prereq generate-mock
 	mkdir -p target/reports

diff --git a/commands/common/cmd_commons.go b/commands/common/cmd_commons.go
@@ -1,6 +1,6 @@
 package common
 
-//go:generate mockgen -source=${GOFILE} -destination=mocks/${GOFILE}
+//go:generate ${TOOLS_DIR}/mockgen -source=${GOFILE} -destination=mocks/${GOFILE}
 
 import (
 	"bytes"

diff --git a/commands/common/manifest.go b/commands/common/manifest.go
@@ -1,6 +1,6 @@
 package common
 
-//go:generate mockgen -source=${GOFILE} -destination=mocks/${GOFILE}
+//go:generate ${TOOLS_DIR}/mockgen -source=${GOFILE} -destination=mocks/${GOFILE}
 
 import (
 	"encoding/json"