Source Knative hack scripts using a binary

Signed-off-by: Ali Ok <[email protected]>
knative-extensions · Jan 7, 2025 · c34a297 · c34a297
1 parent 8b7020c
commit c34a297
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 8 deletions.
diff --git a/hack/release.sh b/hack/release.sh
@@ -17,7 +17,7 @@
 # Documentation about this script and how to use it can be found
 # at https://github.com/knative/test-infra/tree/master/ci
 
-source $(dirname $0)/../vendor/knative.dev/hack/release.sh
+source "$(go run knative.dev/hack/cmd/script library.sh)"
 source $(dirname $0)/artifacts-env.sh
 
 export GO111MODULE=on

diff --git a/hack/tools.go b/hack/tools.go
@@ -22,6 +22,7 @@ package tools
 import (
 	_ "knative.dev/eventing/hack"
 	_ "knative.dev/hack"
+	_ "knative.dev/hack/cmd/script" // Allow calling embedded scripts from hack
 	_ "knative.dev/pkg/hack"
 
 	// eventshub is a cloudevents sender/receiver utility for e2e testing.

diff --git a/hack/update-deps.sh b/hack/update-deps.sh
@@ -18,6 +18,6 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-source $(dirname "$0")/../vendor/knative.dev/hack/library.sh
+source "$(go run knative.dev/hack/cmd/script library.sh)"
 
 go_update_deps "$@"
diff --git a/hack/update-templates.sh b/hack/update-templates.sh
@@ -18,7 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-source $(dirname "$0")/../vendor/knative.dev/hack/library.sh
+source "$(go run knative.dev/hack/cmd/script library.sh)"
 
 readonly FUNC_BINARY_DIR="$(mktemp -d ${REPO_ROOT_DIR}/tmpfuncdir.XXXXXX)"
 

diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh
@@ -18,7 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-source $(dirname "$0")/../vendor/knative.dev/hack/library.sh
+source "$(go run knative.dev/hack/cmd/script library.sh)"
 
 "${REPO_ROOT_DIR}/hack/verify-templates.sh"
 "${REPO_ROOT_DIR}/hack/verify-deps.sh"
diff --git a/hack/verify-deps.sh b/hack/verify-deps.sh
@@ -18,7 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-source $(dirname "$0")/../vendor/knative.dev/hack/library.sh
+source "$(go run knative.dev/hack/cmd/script library.sh)"
 
 readonly TMP_DIFFROOT="$(mktemp -d ${REPO_ROOT_DIR}/tmpdepsdiffroot.XXXXXX)"
 

diff --git a/hack/verify-templates.sh b/hack/verify-templates.sh
@@ -18,7 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-source $(dirname "$0")/../vendor/knative.dev/hack/library.sh
+source "$(go run knative.dev/hack/cmd/script library.sh)"
 
 readonly TMP_DIFFROOT="$(mktemp -d ${REPO_ROOT_DIR}/tmptemplatesdiffroot.XXXXXX)"
 

diff --git a/test/e2e-common.sh b/test/e2e-common.sh
@@ -20,7 +20,7 @@ export KO_FLAGS="${KO_FLAGS:-}"
 
 repo_root_dir=$(dirname "$(realpath "${BASH_SOURCE[0]}")")/..
 
-source "${repo_root_dir}"/vendor/knative.dev/hack/e2e-tests.sh
+source "$(go run knative.dev/hack/cmd/script e2e-tests.sh)"
 source "${repo_root_dir}"/hack/control-plane.sh
 source "${repo_root_dir}"/hack/artifacts-env.sh
 

diff --git a/test/presubmit-tests.sh b/test/presubmit-tests.sh
@@ -24,7 +24,7 @@
 export GO111MODULE=on
 export DISABLE_MD_LINTING=1
 
-source $(dirname "$0")/../vendor/knative.dev/hack/presubmit-tests.sh
+source "$(go run knative.dev/hack/cmd/script presubmit-tests.sh)"
 
 function unit_tests() {
   header "Running Go unit tests"