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

Merge pull request #16886 from tessapham/bom

Browse Source 
update dependency in BOM check
This commit is contained in:
Marek Siarkowicz 2023-11-08 01:45:17 +01:00 committed by GitHub
commit 3bf21cdb3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/test.sh
View File

@ -502,7 +502,7 @@ function bom_pass {
run cp go.sum go.sum.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-materials \
output=$(GOFLAGS=-mod=mod run_go_tool github.com/appscodelabs/license-bill-of-materials \
--override-file ./bill-of-materials.override.json \
"${modules[@]}")
code="$?"
@ -652,7 +652,7 @@ function run_pass {
local pass="${1}"
shift 1
log_callout -e "\\n'${pass}' started at $(date)"
if "${pass}_pass" "$@" ; then
if "${pass}_pass" "${@}" ; then
log_success "'${pass}' PASSED and completed at $(date)"
return 0
else
@ -668,7 +668,7 @@ function run_pass {
log_callout "Starting at: $(date)"
fail_flag=false
for pass in $PASSES; do
if run_pass "${pass}" "${@}"; then
if run_pass "${pass}" "$@"; then
continue
else
fail_flag=true

2
scripts/updatebom.sh
View File

@ -14,7 +14,7 @@ function bom_fixlet {
# shellcheck disable=SC2207
modules=($(modules_exp))
if GOFLAGS=-mod=mod run_go_tool "github.com/coreos/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 \
"${modules[@]}" > ./bill-of-materials.json.tmp; then
cp ./bill-of-materials.json.tmp ./bill-of-materials.json

2
tools/mod/go.mod
View File

@ -4,9 +4,9 @@ go 1.21
require (
github.com/alexfalkowski/gocovmerge v1.2.2
github.com/appscodelabs/license-bill-of-materials v0.0.0-20220707232035-6018e0c5287c
github.com/chzchzchz/goword v0.0.0-20170907005317-a9744cb52b03
github.com/cloudflare/cfssl v1.6.4
github.com/coreos/license-bill-of-materials v0.0.0-20190913234955-13baff47494e
github.com/gogo/protobuf v1.3.2
github.com/google/addlicense v1.1.1
github.com/google/yamlfmt v0.10.0

2
tools/mod/go.sum
View File

@ -14,6 +14,8 @@ github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk
github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
github.com/alexfalkowski/gocovmerge v1.2.2 h1:u/bWOCfOg0i4EUGOgdNrIVohqkY+kx9h7lGcStWepyk=
github.com/alexfalkowski/gocovmerge v1.2.2/go.mod h1:CzvCVcq2uBcjYM7V37cKG8+g74O4wPpUzPqFCwNDrMU=
github.com/appscodelabs/license-bill-of-materials v0.0.0-20220707232035-6018e0c5287c h1:xv0ICJ4AO52aNZ+vI2KFUYZBMh7dHvROixZ1vzMMfu8=
github.com/appscodelabs/license-bill-of-materials v0.0.0-20220707232035-6018e0c5287c/go.mod h1:Y5/1I+0gnnhHKyX4z65mgaGTJ08tnz9WUgkoymA/cws=
github.com/bitfield/gotestdox v0.2.1 h1:Zj8IMLAO5/oiAKoMmtN96eyFiPZraJRTH2p0zDgtxc0=
github.com/bitfield/gotestdox v0.2.1/go.mod h1:D+gwtS0urjBrzguAkTM2wodsTQYFHdpx8eqRJ3N+9pY=
github.com/bmatcuk/doublestar/v4 v4.0.2/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=

2
tools/mod/tools.go
View File

@ -22,10 +22,10 @@ package tools
import (
_ "github.com/alexfalkowski/gocovmerge"
_ "github.com/appscodelabs/license-bill-of-materials"
_ "github.com/chzchzchz/goword"
_ "github.com/cloudflare/cfssl/cmd/cfssl"
_ "github.com/cloudflare/cfssl/cmd/cfssljson"
_ "github.com/coreos/license-bill-of-materials"
_ "github.com/google/addlicense"
_ "github.com/google/yamlfmt/cmd/yamlfmt"
_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway"