Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #157 from dnephin/make-compose-check-fail 

Fix check-git-diff in CI
This commit is contained in:
Tibor Vass 2017-06-12 17:15:35 -07:00 committed by GitHub
parent f82f61efc6 f75a44ffd8
commit 8545341709
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
circle.yml
View File

@ -47,6 +47,7 @@ jobs:
if [ "$CIRCLE_NODE_INDEX" != "3" ]; then exit; fi if [ "$CIRCLE_NODE_INDEX" != "3" ]; then exit; fi
dockerfile=dockerfiles/Dockerfile.dev dockerfile=dockerfiles/Dockerfile.dev
echo "COPY . ." >> $dockerfile echo "COPY . ." >> $dockerfile
rm -f .dockerignore # include .git
docker build -f $dockerfile --tag cli-builder . docker build -f $dockerfile --tag cli-builder .
docker run cli-builder make -B vendor compose-jsonschema docker run cli-builder make -B vendor compose-jsonschema

5
scripts/validate/check-git-diff
View File

@ -3,12 +3,13 @@
set -eu set -eu
DIFF_PATH=$1 DIFF_PATH=$1
DIFF=$(git status --porcelain -- $DIFF_PATH)
if [ "`git status --porcelain -- $DIFF_PATH 2>/dev/null`" ]; then if [ "$DIFF" ]; then
echo echo
echo "These files were changed:" echo "These files were changed:"
echo echo
git status --porcelain -- $DIFF_PATH 2>/dev/null echo $DIFF
echo echo
exit 1 exit 1
else else