From b5454f1a913d246da9e56b4d8e1dd9873d6d65ce Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Sat, 13 Jan 2018 14:53:10 -0800 Subject: Validate clang-format compliance in travis (#648) --- .travis.yml | 2 ++ scripts/style.sh | 3 +++ 2 files changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 18b04e2..4a6ad23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,11 @@ before_install: - gem install xcpretty - bundle exec pod install --project-directory=Example --repo-update - bundle exec pod install --project-directory=Firestore/Example --no-repo-update + - brew install clang-format script: - "! git grep -I ' $'" # Fail on trailing whitespace in non-binary files + - ./scripts/style.sh test-only # Validate clang-format compliance - ./test.sh # TODO fix os_log deprecation warning in FIRLogger to remove --allow-warnings diff --git a/scripts/style.sh b/scripts/style.sh index 72f7520..116c872 100755 --- a/scripts/style.sh +++ b/scripts/style.sh @@ -57,6 +57,9 @@ fi \%/third_party/% d \%/Firestore/Port/% d +# Sources pulled in by travis bundler +\%/vendor/bundle/% d + # Sources within the tree that are not subject to formatting \%^./(Example|Firebase)/(Auth|AuthSamples|Database|Messaging)/% d -- cgit v1.2.3