diff --git a/Makefile b/Makefile index dca94ecbe..eb9de9550 100644 --- a/Makefile +++ b/Makefile @@ -347,7 +347,7 @@ uninstall: ifeq ($(GOOS),windows) install-deps: - script/setup/install-runc + # TODO: need a script for hcshim something like containerd/cri/hack/install/windows/install-hcsshim.sh script/setup/install-critools script/setup/install-cni-windows else diff --git a/script/setup/critools-version b/script/setup/critools-version new file mode 100644 index 000000000..b045f193d --- /dev/null +++ b/script/setup/critools-version @@ -0,0 +1 @@ +0f5f734a7e1da0979915c6e7d5b6641bd9dc2627 diff --git a/script/setup/install-critools b/script/setup/install-critools index 058c2d2d5..232dfbcf5 100755 --- a/script/setup/install-critools +++ b/script/setup/install-critools @@ -20,9 +20,12 @@ # set -eu -o pipefail +script_dir="$(cd -- "$(dirname -- "$0")" > /dev/null 2>&1; pwd -P)" + cd "$GOPATH" go get -u github.com/onsi/ginkgo/ginkgo -CRITEST_COMMIT=0f5f734a7e1da0979915c6e7d5b6641bd9dc2627 + +: "${CRITEST_COMMIT:=$(cat "${script_dir}/critools-version")}" TMPROOT=$(mktemp -d) git clone https://github.com/kubernetes-sigs/cri-tools.git "${TMPROOT}"/cri-tools