Merge commit 'e6db50df7eefbc7a0f116e5dff79b01d9cc22741' into vendor-check

Author: pohly

release-tools/build.make

@@ -117,6 +117,16 @@ test-fmt:
 		false; \
 	fi
 
+# This test only runs when dep >= 0.5 is installed, which is the case for the CI setup.
+.PHONY: test-vendor
+test: test-vendor
+test-vendor:
+	@ echo; echo "### $@:"
+	@ case "$$(dep version 2>/dev/null | grep 'version *:')" in \
+		*v0.[56789]*) dep check && echo "vendor up-to-date" || false;; \
+		*) echo "skipping check, dep >= 0.5 required";; \
+	esac
+
 .PHONY: test-subtree
 test: test-subtree
 test-subtree:

release-tools/travis.yml

@@ -5,6 +5,11 @@ services:
 matrix:
   include:
   - go: 1.11.1
+before_script:
+- mkdir -p bin
+- wget https://github.com/golang/dep/releases/download/v0.5.1/dep-linux-amd64 -O bin/dep
+- chmod u+x bin/dep
+- export PATH=$PWD/bin:$PATH
 script:
 - make -k all test
 after_success:

release-tools/verify-subtree.sh

@@ -30,7 +30,7 @@ if [ ! "$DIR" ]; then
     exit 1
 fi
 
-REV=$(git log -n1 --format=format:%H --no-merges -- "$DIR")
+REV=$(git log -n1 --remove-empty --format=format:%H --no-merges -- "$DIR")
 if [ "$REV" ]; then
     echo "Directory '$DIR' contains non-upstream changes:"
     echo