Merge pull request vmware-tanzu#244 from kaovilai/1.0-ci-2

Makefile.prow don't expand KUBEBUILDER_ASSETS until after envtest
kaovilai · Mar 15, 2023 · dfb824d · dfb824d
2 parents b0f2840 + 37c0311
commit dfb824d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,3 +22,4 @@ jobs:
   - script: make verify
   - script: make all
   - script: make test
+  - script: make -f Makefile.prow ci
diff --git a/Makefile.prow b/Makefile.prow
@@ -24,9 +24,8 @@ test: hack-docker
 hack-docker: envtest
 
 GOPATH:=$(shell go env GOPATH)
-KUBEBUILDER_ASSETS:=$(shell $(GOPATH)/bin/setup-envtest use -p path)
 #  if KUBEBUILDER_ASSETS contains space, escape it
-KUBEBUILDER_ASSETS:=$(shell echo $(KUBEBUILDER_ASSETS) | sed 's/ /\\ /g')
+KUBEBUILDER_ASSETS=$(shell echo $(shell $(GOPATH)/bin/setup-envtest use -p path) | sed 's/ /\\ /g')
 .PHONY: envtest
 envtest: $(GOPATH)/bin/setup-envtest
 	$(GOPATH)/bin/setup-envtest use -p path