add GOROOT env for generate k8s subs

Signed-off-by: faceair <git@faceair.me>
jaegertracing · Oct 19, 2020 · c9077ea · c9077ea
1 parent 051e70a
commit c9077ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.ci/vgot.sh b/.ci/vgot.sh
@@ -5,7 +5,7 @@ if [ $# = 0 ]; then
 fi
 d=`mktemp -d`
 cd "$d"
-echo 'module temp' > go.mod
+go mod init temp >/dev/null 2>&1
 for i; do
     pkg=`echo $i | sed 's/@.*//'`
     go get "$i" &&

diff --git a/Makefile b/Makefile
@@ -22,6 +22,7 @@ ES_OPERATOR_BRANCH ?= release-4.4
 ES_OPERATOR_IMAGE ?= quay.io/openshift/origin-elasticsearch-operator:4.4
 SDK_VERSION=v0.18.2
 GOPATH ?= "$(HOME)/go"
+GOROOT ?= "$(shell go env GOROOT)"
 
 PROMETHEUS_OPERATOR_TAG ?= v0.39.0
 PROMETHEUS_BUNDLE ?= https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/${PROMETHEUS_OPERATOR_TAG}/bundle.yaml
@@ -315,7 +316,7 @@ generate: internal-generate format
 
 .PHONY: internal-generate
 internal-generate:
-	@GOPATH=${GOPATH} ./.ci/generate.sh
+	@GOPATH=${GOPATH} GOROOT=${GOROOT} ./.ci/generate.sh
 
 .PHONY: test
 test: unit-tests e2e-tests