summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-07-05 21:33:22 -0400
committerGitHub <noreply@github.com>2017-07-05 21:33:22 -0400
commitbe05c5bd52769b58316986bd7451cb2483571099 (patch)
treee5fa1494fa693f27e452846873deb4bebdf53973
parent1eacd4ee74af05bcc4d4d50d60e257546bef474a (diff)
parentd5f7232c1dd31ff82187acc402173fcd6e76359e (diff)
Merge pull request #353 from yenatch/travis-allow-fail-formatting
travis: allow formatting job to fail instead of falsely reporting passed
-rw-r--r--.travis.yml2
-rwxr-xr-x.travis/check-git-clang-format-output.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 3d620e560..3db6ab6fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,3 +55,5 @@ matrix:
script:
- ./build_tools.sh
- make -j2 compare_ruby_de
+ allow_failures:
+ - env: _="Formatting"
diff --git a/.travis/check-git-clang-format-output.sh b/.travis/check-git-clang-format-output.sh
index e6acf8ced..c53efa726 100755
--- a/.travis/check-git-clang-format-output.sh
+++ b/.travis/check-git-clang-format-output.sh
@@ -17,5 +17,5 @@ if [ "$output" == "no modified files to format" ] || [ "$output" == "clang-forma
else
echo "clang-format failed:"
echo "$output" | colordiff
- exit 0
+ exit 1
fi