Skip to content

Commit 9ad87b9

Browse files
committed
adds critools-version
Signed-off-by: Mike Brown <[email protected]>
1 parent 2205da6 commit 9ad87b9

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ uninstall:
347347

348348
ifeq ($(GOOS),windows)
349349
install-deps:
350-
script/setup/install-runc
350+
# TODO: need a script for hcshim something like containerd/cri/hack/install/windows/install-hcsshim.sh
351351
script/setup/install-critools
352352
script/setup/install-cni-windows
353353
else

script/setup/critools-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0f5f734a7e1da0979915c6e7d5b6641bd9dc2627

script/setup/install-critools

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@
2020
#
2121
set -eu -o pipefail
2222

23+
script_dir="$(cd -- "$(dirname -- "$0")" > /dev/null 2>&1; pwd -P)"
24+
2325
cd "$GOPATH"
2426
go get -u github.com/onsi/ginkgo/ginkgo
25-
CRITEST_COMMIT=0f5f734a7e1da0979915c6e7d5b6641bd9dc2627
27+
28+
: "${CRITEST_COMMIT:=$(cat "${script_dir}/critools-version")}"
2629

2730
TMPROOT=$(mktemp -d)
2831
git clone https://github.com/kubernetes-sigs/cri-tools.git "${TMPROOT}"/cri-tools

0 commit comments

Comments
 (0)