mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
Merge pull request #18603 from lekaf974/feat/rename-module-exp
Rename modules_exp to modules_for_bom to improve code and clarity
This commit is contained in:
commit
ce07474c0b
@ -509,7 +509,7 @@ function bom_pass {
|
|||||||
log_callout "Checking bill of materials..."
|
log_callout "Checking bill of materials..."
|
||||||
# https://github.com/golang/go/commit/7c388cc89c76bc7167287fb488afcaf5a4aa12bf
|
# https://github.com/golang/go/commit/7c388cc89c76bc7167287fb488afcaf5a4aa12bf
|
||||||
# shellcheck disable=SC2207
|
# shellcheck disable=SC2207
|
||||||
modules=($(modules_exp))
|
modules=($(modules_for_bom))
|
||||||
|
|
||||||
# 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
|
||||||
|
@ -196,7 +196,7 @@ function modules() {
|
|||||||
echo "${modules[@]}"
|
echo "${modules[@]}"
|
||||||
}
|
}
|
||||||
|
|
||||||
function modules_exp() {
|
function modules_for_bom() {
|
||||||
for m in $(modules); do
|
for m in $(modules); do
|
||||||
echo -n "${m}/... "
|
echo -n "${m}/... "
|
||||||
done
|
done
|
||||||
|
@ -12,7 +12,7 @@ function bom_fixlet {
|
|||||||
|
|
||||||
local modules
|
local modules
|
||||||
# shellcheck disable=SC2207
|
# shellcheck disable=SC2207
|
||||||
modules=($(modules_exp))
|
modules=($(modules_for_bom))
|
||||||
|
|
||||||
if GOFLAGS=-mod=mod run_go_tool "github.com/appscodelabs/license-bill-of-materials" \
|
if GOFLAGS=-mod=mod run_go_tool "github.com/appscodelabs/license-bill-of-materials" \
|
||||||
--override-file ./bill-of-materials.override.json \
|
--override-file ./bill-of-materials.override.json \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user