From f6c62456b8014388b32327b0c520749ac73b4879 Mon Sep 17 00:00:00 2001 From: Aaron Lehmann Date: Mon, 20 Mar 2017 10:53:40 -0700 Subject: [PATCH] Fix vendor validation The dep-validate target appears to never get invoked. In the CircleCI build environment, "master" points to the commit under test. The circle.yml fragment needs to compare again "origin/master" instead. Signed-off-by: Aaron Lehmann --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 76276763a..b49d64aea 100644 --- a/circle.yml +++ b/circle.yml @@ -50,7 +50,7 @@ test: - gvm use stable && go version # Ensure validation of dependencies - - gvm use stable && if test -n "`git diff --stat=1000 master | grep -E \"^[[:space:]]*vendor\"`"; then make dep-validate; fi: + - gvm use stable && if test -n "`git diff --stat=1000 origin/master | grep -E \"^[[:space:]]*vendor\"`"; then make dep-validate; fi: pwd: $BASE_STABLE # First thing: build everything. This will catch compile errors, and it's