Merge pull request #122020 from Vyom-Yadav/fixOverridingVarInVerify

Fix verify target to not update env var if already set
2023-11-27 04:06:16 +01:00
parent d61cbac69a f730dc39f9
commit ad9b60e2c9
1 changed files with 4 additions and 1 deletions
--- a/build/root/Makefile
+++ b/build/root/Makefile
@@ -123,9 +123,12 @@ endef
 ifeq ($(PRINT_HELP),y)
 verify:
 	echo "$$VERIFY_HELP_INFO"
-else
+else ifeq ($(origin KUBE_VERIFY_GIT_BRANCH), undefined)
 verify:
 	KUBE_VERIFY_GIT_BRANCH=$(BRANCH) hack/make-rules/verify.sh
+else
+verify:
+	hack/make-rules/verify.sh
 endif

 define QUICK_VERIFY_HELP_INFO