diff --git a/.ci/vgot.sh b/.ci/vgot.sh index 462a62aab..c4e088251 100755 --- 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 index b98b63f87..6812b70bb 100644 --- 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