From 56672b961dd2d9ea703e28601b15d989c5cee0de Mon Sep 17 00:00:00 2001 From: Shengjing Zhu Date: Sun, 22 Nov 2020 00:28:27 +0800 Subject: [PATCH] Change to GOPATH before go get So it won't touch go.mod Signed-off-by: Shengjing Zhu --- script/setup/install-cni-windows | 1 + script/setup/install-critools | 1 + script/setup/install-dev-tools | 3 +++ 3 files changed, 5 insertions(+) diff --git a/script/setup/install-cni-windows b/script/setup/install-cni-windows index 146f8ebe8..77adf2c69 100755 --- a/script/setup/install-cni-windows +++ b/script/setup/install-cni-windows @@ -21,6 +21,7 @@ WINCNI_BIN_DIR="${DESTDIR}/cni" WINCNI_PKG=github.com/Microsoft/windows-container-networking WINCNI_VERSION=aa10a0b31e9f72937063436454def1760b858ee2 +cd "$GOPATH" go get -d "${WINCNI_PKG}/..." cd "${GOPATH}/src/${WINCNI_PKG}" git checkout "${WINCNI_VERSION}" diff --git a/script/setup/install-critools b/script/setup/install-critools index 3fe77718a..e511567d9 100755 --- a/script/setup/install-critools +++ b/script/setup/install-critools @@ -20,6 +20,7 @@ # set -eu -o pipefail +cd "$GOPATH" go get -u github.com/onsi/ginkgo/ginkgo CRITEST_COMMIT=0f5f734a7e1da0979915c6e7d5b6641bd9dc2627 go get -d github.com/kubernetes-sigs/cri-tools/... diff --git a/script/setup/install-dev-tools b/script/setup/install-dev-tools index b790594aa..9440d6cf3 100755 --- a/script/setup/install-dev-tools +++ b/script/setup/install-dev-tools @@ -20,6 +20,9 @@ # set -eu -o pipefail +# change to tmp dir, otherwise `go get` will change go.mod +cd "$GOPATH" + # install the `protobuild` binary in $GOPATH/bin; requires module-aware install # to pin dependencies GO111MODULE=on go get github.com/stevvooe/protobuild