From a43001b9716b3c72092bd310ccf141aa8d7d7244 Mon Sep 17 00:00:00 2001
From: maaktweluit <maaktweluit@gmail.com>
Date: Mon, 5 Jun 2017 19:22:40 +0000
Subject: Update travis.yml with Filler exclude

- Excluded *Filler.json from checking
- Excluded *Filler.json from linting
- Updated check output to print all "lines not starting with "./" and the line before" containing the affected file and error close together.
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index e35fba889..68749e554 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,6 @@ python: 2.7
 sudo: false
 script:
 # won't fail, but print problems
-- find . -name "*.json" -exec echo {} \; -exec python -mjson.tool {} /dev/null \; 2>&1 |grep --before 1 "Expecting" | cat
+- find . -name "*.json" -not -name "*Filler.json" -exec echo {} \; -exec python -mjson.tool {} /dev/null \; 2>&1 |grep -v -B 1 "^\./"
 # will fail, if linting fails
-- find . -name "*.json" -print0 | xargs -I file -n1 -0 python -mjson.tool file /dev/null 
+- find . -name "*.json" -not -name "*Filler.json" -print0 | xargs -I file -n1 -0 python -mjson.tool file /dev/null 
-- 
cgit v1.2.3


From 64d2f389f6196859b79e95887ef6326aea09af5d Mon Sep 17 00:00:00 2001
From: maaktweluit <maaktweluit@gmail.com>
Date: Mon, 5 Jun 2017 20:14:01 +0000
Subject: Made check not throw errors with | cat

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 68749e554..dbced1cd9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,6 @@ python: 2.7
 sudo: false
 script:
 # won't fail, but print problems
-- find . -name "*.json" -not -name "*Filler.json" -exec echo {} \; -exec python -mjson.tool {} /dev/null \; 2>&1 |grep -v -B 1 "^\./"
+- find . -name "*.json" -not -name "*Filler.json" -exec echo {} \; -exec python -mjson.tool {} /dev/null \; 2>&1 | grep -v -B 1 "^\./" | cat
 # will fail, if linting fails
 - find . -name "*.json" -not -name "*Filler.json" -print0 | xargs -I file -n1 -0 python -mjson.tool file /dev/null 
-- 
cgit v1.2.3