diff options
| author |  Marek Gilbert <mcg@google.com> | 2018-03-09 11:36:16 -0800 |
|---|---|---|
| committer | Marek Gilbert <mcg@google.com> | 2018-03-09 11:36:16 -0800 |
| commit | 5be66dcf5af480b5822550c680d24b873959211f (patch) | |
| tree | c92e39372d3df18fc637b3dcc7d8a89c3cbbda93 /.travis.yml | |
| parent | d44174e1d21acb265dc9d8967dea3df92799a3b8 (diff) | |
| parent | e41f4b1857e13c223d8a639329cc784d603ac66e (diff) | |
Merge branch 'master' into wilhuff/merge-release-4.10.1
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 7c1c0b4..691d9d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,17 +30,18 @@ before_install: fi script: - # Fail on trailing whitespace in non-binary, non-generated-nanopb files - - "! git grep -I ' $' ':(exclude)Firestore/Protos/nanopb'" - - "! git grep -EL --name-only 'Copyright [0-9]{4}.*Google' | grep -v third_party | egrep '\\.(m|h|cc|mm|c)$'" - - ./scripts/style.sh test-only # Validate clang-format compliance + - ./scripts/check_whitespace.sh + - ./scripts/check_copyright.sh + - ./scripts/style.sh test-only $TRAVIS_COMMIT_RANGE - | - if [ $SKIP_FIREBASE != 1 ]; then - ./test.sh + # Google C++ style compliance + if [ $SKIP_FIRESTORE != 1 ]; then + ./scripts/lint.sh $TRAVIS_COMMIT_RANGE fi + - | - if [ $SKIP_FIRESTORE != 1 ]; then - ./scripts/lint.sh # Google C++ style compliance + if [ $SKIP_FIREBASE != 1 ]; then + ./test.sh fi - | if [ $SKIP_FIRESTORE != 1 ]; then |