Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove dependency on gobin

Browse Source 
Signed-off-by: Benjamin Wang <wachao@vmware.com>
This commit is contained in:
Benjamin Wang 2022-12-19 14:20:45 +08:00
parent 413ec16175
commit 925c0611e0
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/test_lib.sh
View File

@ -310,16 +310,25 @@ fi
# tool_get_bin [tool] - returns absolute path to a tool binary (or returns error) # tool_get_bin [tool] - returns absolute path to a tool binary (or returns error)
function tool_get_bin { function tool_get_bin {
tool_exists "gobin" "GO111MODULE=off go get github.com/myitcv/gobin" || return 2
local tool="$1" local tool="$1"
local pkg_part="$1"
if [[ "$tool" == *"@"* ]]; then if [[ "$tool" == *"@"* ]]; then
pkg_part=$(echo "${tool}" | cut -d'@' -f1)
# shellcheck disable=SC2086 # shellcheck disable=SC2086
run gobin ${GOBINARGS:-} -p "${tool}" || return 2 run go install ${GOBINARGS:-} "${tool}" || return 2
else else
# shellcheck disable=SC2086 # shellcheck disable=SC2086
run_for_module ./tools/mod run gobin ${GOBINARGS:-} -p -m --mod=readonly "${tool}" || return 2 run_for_module ./tools/mod run go install ${GOBINARGS:-} "${tool}" || return 2
fi fi
# remove the version suffix, such as removing "/v3" from "go.etcd.io/etcd/v3".
local cmd_base_name
cmd_base_name=$(basename "${pkg_part}")
if [[ ${cmd_base_name} =~ ^v[0-9]*$ ]]; then
pkg_part=$(dirname "${pkg_part}")
fi
run_for_module ./tools/mod go list -f '{{.Target}}' "${pkg_part}"
} }
# tool_pkg_dir [pkg] - returns absolute path to a directory that stores given pkg. # tool_pkg_dir [pkg] - returns absolute path to a directory that stores given pkg.

14
test.sh
View File

@ -567,6 +567,20 @@ function bom_pass {
"${modules[@]}") "${modules[@]}")
code="$?" code="$?"
if [ "${code}" -ne 0 ] ; then
# license-bill-of-materials.go has a bug, it may get `go list ...` output
# included in the `names`. See,
# https://github.com/coreos/license-bill-of-materials/blob/13baff47494e3f89fe1b67818363c3bc2fb12b8a/license-bill-of-materials.go#L204-L222
# So we need to try one more time.
# ${HOME}/go/pkg/mod.
# TODO(ahrtr): get rid of https://github.com/coreos/license-bill-of-materials.
output=$(GOFLAGS=-mod=mod run_go_tool github.com/coreos/license-bill-of-materials \
--override-file ./bill-of-materials.override.json \
"${modules[@]}")
code="$?"
fi
run cp go.sum.tmp go.sum || return 2 run cp go.sum.tmp go.sum || return 2
run cp go.mod.tmp go.mod || return 2 run cp go.mod.tmp go.mod || return 2