From dca13c6d4755e4483cbba67435742374b3c05c93 Mon Sep 17 00:00:00 2001 From: kkkkun Date: Fri, 9 Jun 2023 14:17:29 +0800 Subject: [PATCH] replace gobin with go install Signed-off-by: kkkkun --- scripts/test_lib.sh | 5 ----- tests/Dockerfile | 1 - tools/mod/install_all.sh | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/scripts/test_lib.sh b/scripts/test_lib.sh index 6a40c1b70..fc5985af8 100644 --- a/scripts/test_lib.sh +++ b/scripts/test_lib.sh @@ -305,11 +305,6 @@ function tool_exists { fi } -# Ensure gobin is available, as it runs majority of the tools -if ! command -v "gobin" >/dev/null; then - run env GO111MODULE=off go get github.com/myitcv/gobin || exit 1 -fi - # tool_get_bin [tool] - returns absolute path to a tool binary (or returns error) function tool_get_bin { local tool="$1" diff --git a/tests/Dockerfile b/tests/Dockerfile index 9b1809dd9..09c17912d 100644 --- a/tests/Dockerfile +++ b/tests/Dockerfile @@ -44,7 +44,6 @@ WORKDIR ${GOPATH}/src/go.etcd.io/etcd ADD ./scripts/install-marker.sh /tmp/install-marker.sh -RUN GO111MODULE=off go get github.com/myitcv/gobin RUN /tmp/install-marker.sh amd64 \ && rm -f /tmp/install-marker.sh \ && curl -s https://codecov.io/bash >/codecov \ diff --git a/tools/mod/install_all.sh b/tools/mod/install_all.sh index 7de5fb014..2f099b5ea 100755 --- a/tools/mod/install_all.sh +++ b/tools/mod/install_all.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash cd ./tools/mod || exit 2 -go list --tags tools -f '{{ join .Imports "\n" }}' | xargs gobin -p +go list --tags tools -f '{{ join .Imports "\n" }}' | xargs go install