diff --git a/Makefile b/Makefile index 125afba26..74345c451 100644 --- a/Makefile +++ b/Makefile @@ -134,6 +134,7 @@ endif SHELLCHECK_VERSION=v0.9.0 SHELLCHECK_PATH=${TOOLS_DIR}/shellcheck-$(SHELLCHECK_VERSION) SHELLCHECK_BIN=${SHELLCHECK_PATH}/shellcheck +export PATH := $(BASE_DIR)/$(SHELLCHECK_PATH):$(PATH) SHELLCHECK_ARCHIVE := shellcheck-$(SHELLCHECK_VERSION).$(OS).$(HOST_ARCH).tar.xz ifeq (darwin, $(OS)) ifeq (arm64, $(HOST_ARCH)) @@ -151,16 +152,19 @@ GOLANGCI_LINT_PATH=$(TOOLS_DIR)/golangci-lint-v$(GOLANGCI_LINT_VERSION) GOLANGCI_LINT_BIN=$(GOLANGCI_LINT_PATH)/golangci-lint GOLANGCI_LINT_ARCHIVE=golangci-lint-$(GOLANGCI_LINT_VERSION)-$(OS)-$(EXEC_ARCH).tar.gz GOLANGCI_LINT_ARCHIVEBASE=golangci-lint-$(GOLANGCI_LINT_VERSION)-$(OS)-$(EXEC_ARCH) +export PATH := $(BASE_DIR)/$(GOLANGCI_LINT_PATH):$(PATH) # kubectl KUBECTL_VERSION=v1.27.7 KUBECTL_PATH=$(TOOLS_DIR)/kubectl-$(KUBECTL_VERSION) KUBECTL_BIN=$(KUBECTL_PATH)/kubectl +export PATH := $(BASE_DIR)/$(KUBECTL_PATH):$(PATH) # kind KIND_VERSION=v0.23.0 KIND_PATH=$(TOOLS_DIR)/kind-$(KIND_VERSION) KIND_BIN=$(KIND_PATH)/kind +export PATH := $(BASE_DIR)/$(KIND_PATH):$(PATH) # helm HELM_VERSION=v3.12.1 @@ -168,6 +172,7 @@ HELM_PATH=$(TOOLS_DIR)/helm-$(HELM_VERSION) HELM_BIN=$(HELM_PATH)/helm HELM_ARCHIVE=helm-$(HELM_VERSION)-$(OS)-$(EXEC_ARCH).tar.gz HELM_ARCHIVE_BASE=$(OS)-$(EXEC_ARCH) +export PATH := $(BASE_DIR)/$(HELM_PATH):$(PATH) # spark export SPARK_VERSION=3.3.3 @@ -176,16 +181,22 @@ export SPARK_PYTHON_VERSION=3.3.1 export SPARK_HOME=$(BASE_DIR)$(TOOLS_DIR)/spark-v$(SPARK_VERSION) export SPARK_SUBMIT_CMD=$(SPARK_HOME)/bin/spark-submit export SPARK_PYTHON_IMAGE=docker.io/apache/spark-py:v$(SPARK_PYTHON_VERSION) +export PATH := $(SPARK_HOME):$(PATH) # go-licenses GO_LICENSES_VERSION=v1.6.0 GO_LICENSES_PATH=$(TOOLS_DIR)/go-licenses-$(GO_LICENSES_VERSION) GO_LICENSES_BIN=$(GO_LICENSES_PATH)/go-licenses +export PATH := $(BASE_DIR)/$(GO_LICENSES_PATH):$(PATH) # ginkgo GINKGO_VERSION=v2.19.0 GINKGO_PATH=$(TOOLS_DIR)/ginkgo-$(GINKGO_VERSION) GINKGO_BIN=$(GINKGO_PATH)/ginkgo +export PATH := $(BASE_DIR)/$(GINKGO_PATH):$(PATH) + +# PATH +# export PATH := $(BASE_DIR)/$(TOOLS_DIR):$(GO_EXE_PATH):$(BASE_DIR)/$(SHELLCHECK_PATH):$(BASE_DIR)/$(GOLANGCI_LINT_PATH):$(BASE_DIR)/$(KUBECTL_PATH):$(BASE_DIR)/$(KIND_PATH):$(BASE_DIR)/$(HELM_PATH):$(SPARK_HOME):$(BASE_DIR)/$(GO_LICENSES_PATH):$(BASE_DIR)/$(GINKGO_PATH):$(PATH) FLAG_PREFIX=github.com/apache/yunikorn-k8shim/pkg/conf