kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #40148 from kolyshkin/vendor-diff 

hack/validate/vendor: print diff for modified files
This commit is contained in:
Sebastiaan van Stijn 2019-11-07 12:42:03 -08:00 committed by GitHub
parent fee149e723 5791019028
commit e9bd017b68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hack/validate/vendor
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash
export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source "${SCRIPTDIR}/.validate"
validate_vendor_diff(){
@ -13,6 +13,7 @@ validate_vendor_diff(){
vndr
# check if any files have changed
diffs="$(git status --porcelain -- vendor 2>/dev/null)"
mfiles="$(echo "$diffs" | awk '/^ M / {print $2}')"
if [ "$diffs" ]; then
{
echo 'The result of vndr differs'
@ -21,6 +22,9 @@ validate_vendor_diff(){
echo
echo 'Please vendor your package with github.com/LK4D4/vndr.'
echo
if [ -n "$mfiles" ] ; then
git diff -- "$mfiles"
fi
} >&2
false
else
@ -34,11 +38,10 @@ validate_vendor_diff(){
# 1. make sure all the vendored packages are used
# 2. make sure all the packages contain license information (just warning, because it can cause false-positive)
validate_vendor_used() {
pkgs=$(mawk '/^[a-zA-Z0-9]/ { print $1 }' < vendor.conf)
for f in $pkgs; do
if ls -d vendor/$f > /dev/null 2>&1; then
found=$(find vendor/$f -iregex '.*LICENSE.*' -or -iregex '.*COPYRIGHT.*' -or -iregex '.*COPYING.*' | wc -l)
if [ $found -eq 0 ]; then
for f in $(mawk '/^[a-zA-Z0-9]/ { print $1 }' vendor.conf); do
if [ -d "vendor/$f" ]; then
found=$(echo "vendor/$f/"* | grep -iEc '/(LICENSE|COPYING)')
if [ "$found" -eq 0 ]; then
echo "WARNING: could not find copyright information for $f"
fi
else