From f75a44ffd8170e727067875b443bdb3e88b6438e Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Tue, 6 Jun 2017 15:02:28 -0400 Subject: [PATCH] Fix check-git-diff so that it fails on CI Signed-off-by: Daniel Nephin --- circle.yml | 1 + scripts/validate/check-git-diff | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index dabc4c5aad..9985274b43 100644 --- a/circle.yml +++ b/circle.yml @@ -45,6 +45,7 @@ jobs: if [ "$CIRCLE_NODE_INDEX" != "3" ]; then exit; fi dockerfile=dockerfiles/Dockerfile.dev echo "COPY . ." >> $dockerfile + rm -f .dockerignore # include .git docker build -f $dockerfile --tag cli-builder . docker run cli-builder make -B vendor compose-jsonschema diff --git a/scripts/validate/check-git-diff b/scripts/validate/check-git-diff index e41970a35a..4cdc0d2db6 100755 --- a/scripts/validate/check-git-diff +++ b/scripts/validate/check-git-diff @@ -3,12 +3,13 @@ set -eu DIFF_PATH=$1 +DIFF=$(git status --porcelain -- $DIFF_PATH) -if [ "`git status --porcelain -- $DIFF_PATH 2>/dev/null`" ]; then +if [ "$DIFF" ]; then echo echo "These files were changed:" echo - git status --porcelain -- $DIFF_PATH 2>/dev/null + echo $DIFF echo exit 1 else