From d6d073b106be4890a037653849509e5805e92b51 Mon Sep 17 00:00:00 2001 From: Kazuyoshi Kato Date: Fri, 3 Dec 2021 14:22:04 -0800 Subject: [PATCH] Do not use `go get` to install executables https://go.dev/doc/go-get-install-deprecation Based on commit 6b0e2414c8326554b4c0a1e959d498b7202e17fc, but modified to apply to the 1.4 branch. Signed-off-by: Kazuyoshi Kato Signed-off-by: Sebastiaan van Stijn --- script/setup/install-critools | 3 ++- script/setup/install-dev-tools | 10 ++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/script/setup/install-critools b/script/setup/install-critools index b6a35adf9224..d42a52d65f7f 100755 --- a/script/setup/install-critools +++ b/script/setup/install-critools @@ -20,7 +20,8 @@ # set -eu -o pipefail -go get -u github.com/onsi/ginkgo/ginkgo +GO111MODULE=on go install github.com/onsi/ginkgo/ginkgo@v1.16.5 + CRITEST_COMMIT=53ad8bb7f97e1b1d1c0c0634e43a3c2b8b07b718 git clone https://github.com/kubernetes-sigs/cri-tools.git "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools cd "$GOPATH"/src/github.com/kubernetes-sigs/cri-tools diff --git a/script/setup/install-dev-tools b/script/setup/install-dev-tools index b790594aaf29..281c0f8acff9 100755 --- a/script/setup/install-dev-tools +++ b/script/setup/install-dev-tools @@ -20,15 +20,13 @@ # set -eu -o pipefail -# install the `protobuild` binary in $GOPATH/bin; requires module-aware install -# to pin dependencies -GO111MODULE=on go get github.com/stevvooe/protobuild +# install `protobuild` and other commands +GO111MODULE=on go install github.com/stevvooe/protobuild@v0.1.0 +GO111MODULE=on go install github.com/cpuguy83/go-md2man/v2@v2.0.0 +GO111MODULE=on go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.23.8 # the following packages need to exist in $GOPATH so we can't use # go modules-aware mode of `go get` for these includes used during # proto building GO111MODULE=off go get -d github.com/gogo/googleapis || true GO111MODULE=off go get -d github.com/gogo/protobuf || true - -GO111MODULE=on go get github.com/cpuguy83/go-md2man/v2@v2.0.0 -GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.23.8