diff --git a/hack/make/validate-vet b/hack/make/validate-vet index 39f4a2c1..f95d0fc8 100755 --- a/hack/make/validate-vet +++ b/hack/make/validate-vet @@ -1,28 +1,13 @@ #!/bin/bash -source "$(dirname "$BASH_SOURCE")/.validate" +errors=$(go vet $(go list -e ./... | grep -v "$SKOPEO_PKG"/vendor)) -IFS=$'\n' -files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/' || true) ) -unset IFS - -errors=() -for f in "${files[@]}"; do - failedVet=$(go vet "$f") - if [ "$failedVet" ]; then - errors+=( "$failedVet" ) - fi -done - - -if [ ${#errors[@]} -eq 0 ]; then +if [ -z "$errors" ]; then echo 'Congratulations! All Go source files have been vetted.' else { echo "Errors from go vet:" - for err in "${errors[@]}"; do - echo " - $err" - done + echo "$errors" echo echo 'Please fix the above errors. You can test via "go vet" and commit the result.' echo