diff --git a/Gopkg.lock b/Gopkg.lock index 3ae7a064f107..30cf565f969e 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -347,11 +347,11 @@ [[projects]] branch = "master" - digest = "1:851129618684df5fe963fd5fe7bf75efb28e9adde03855d836cfe1a9ed1e5f4a" + digest = "1:4d691ff60dc78ba976789a94661167acbb29a9bcf342ac7f77d8dda603f0f023" name = "github.com/knative/test-infra" packages = ["."] pruneopts = "T" - revision = "f53c40459b2d126c32f5139ee0d9251748ad6dd8" + revision = "d9996f1f958db6e7425e4f5a752e9412cf8df98f" [[projects]] branch = "master" diff --git a/test/presubmit-tests.sh b/test/presubmit-tests.sh index e54a475b964e..19166fc5ebab 100755 --- a/test/presubmit-tests.sh +++ b/test/presubmit-tests.sh @@ -33,11 +33,9 @@ function build_tests() { go test -run=^$ -tags=e2e ./test/... || result=1 subheader "Checking autogenerated code is up-to-date" ./hack/verify-codegen.sh || result=1 - subheader "Checking for forbidden licenses" - # Fetch the google/licenseclassifier for its license db - go get github.com/google/licenseclassifier # Check that we don't have any forbidden licenses in our images. - dep-collector -check ./cmd/* || result=1 + subheader "Checking for forbidden licenses" + check_licenses ./cmd/* || result=1 return ${result} } diff --git a/vendor/github.com/knative/test-infra/scripts/library.sh b/vendor/github.com/knative/test-infra/scripts/library.sh index 5936fde1d83c..d202384f8203 100755 --- a/vendor/github.com/knative/test-infra/scripts/library.sh +++ b/vendor/github.com/knative/test-infra/scripts/library.sh @@ -44,7 +44,8 @@ function make_banner() { # Simple header for logging purposes. function header() { - make_banner "=" "${1^^}" + local upper="$(echo $1 | tr a-z A-Z)" + make_banner "=" "${upper}" } # Simple subheader for logging purposes. @@ -259,6 +260,16 @@ function start_latest_knative_build() { wait_until_pods_running knative-build || return 1 } +# Run dep-collector, installing it first if necessary. +# Parameters: $1..$n - parameters passed to dep-collector. +function run_dep_collector() { + local local_dep_collector="$(which dep-collector)" + if [[ -z ${local_dep_collector} ]]; then + go get -u github.com/mattmoor/dep-collector + fi + dep-collector $@ +} + # Run dep-collector to update licenses. # Parameters: $1 - output file, relative to repo root dir. # $2...$n - directories and files to inspect. @@ -266,11 +277,16 @@ function update_licenses() { cd ${REPO_ROOT_DIR} || return 1 local dst=$1 shift - local local_dep_collector="$(which dep-collector)" - if [[ -z ${local_dep_collector} ]]; then - go get -u github.com/mattmoor/dep-collector - fi - dep-collector $@ > ./${dst} + run_dep_collector $@ > ./${dst} +} + +# Run dep-collector to check for forbidden liceses. +# Parameters: $1...$n - directories and files to inspect. +function check_licenses() { + # Fetch the google/licenseclassifier for its license db + go get -u github.com/google/licenseclassifier + # Check that we don't have any forbidden licenses in our images. + run_dep_collector -check $@ } # Check links in all .md files in the repo.