test.sh (etcd-3.5.6) | : | test.sh (etcd-3.5.7) | ||
---|---|---|---|---|
skipping to change at line 567 | skipping to change at line 567 | |||
# Internally license-bill-of-materials tends to modify go.sum | # Internally license-bill-of-materials tends to modify go.sum | |||
run cp go.sum go.sum.tmp || return 2 | run cp go.sum go.sum.tmp || return 2 | |||
run cp go.mod go.mod.tmp || return 2 | run cp go.mod go.mod.tmp || return 2 | |||
output=$(GOFLAGS=-mod=mod run_go_tool github.com/coreos/license-bill-of-materi als \ | output=$(GOFLAGS=-mod=mod run_go_tool github.com/coreos/license-bill-of-materi als \ | |||
--override-file ./bill-of-materials.override.json \ | --override-file ./bill-of-materials.override.json \ | |||
"${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/13baff47494e3f89f | ||||
e1b67818363c3bc2fb12b8a/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-material | ||||
s. | ||||
output=$(GOFLAGS=-mod=mod run_go_tool github.com/coreos/license-bill-of-mate | ||||
rials \ | ||||
--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 | |||
if [ "${code}" -ne 0 ] ; then | if [ "${code}" -ne 0 ] ; then | |||
log_error -e "license-bill-of-materials (code: ${code}) failed with:\\n${out put}" | log_error -e "license-bill-of-materials (code: ${code}) failed with:\\n${out put}" | |||
return 255 | return 255 | |||
else | else | |||
echo "${output}" > "bom-now.json.tmp" | echo "${output}" > "bom-now.json.tmp" | |||
fi | fi | |||
if ! diff ./bill-of-materials.json bom-now.json.tmp; then | if ! diff ./bill-of-materials.json bom-now.json.tmp; then | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 17 lines changed or added |