diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-09-25 10:05:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 10:05:30 -0700 |
| commit | c34ecf1ff06704562ff230c9bfaadd0b4881e335 (patch) | |
| tree | b839acff75cdfa0002dfb9686e3a7970493b5c5d | |
| parent | 0f7f5cd93a7cc866443eb882643acdd8b335cffd (diff) | |
| download | googletest-c34ecf1ff06704562ff230c9bfaadd0b4881e335.tar.gz googletest-c34ecf1ff06704562ff230c9bfaadd0b4881e335.tar.bz2 googletest-c34ecf1ff06704562ff230c9bfaadd0b4881e335.zip | |
Revert "Add clang format check to one of the builds"
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | ci/test_format.sh | 33 |
2 files changed, 1 insertions, 36 deletions
diff --git a/.travis.yml b/.travis.yml index 3e13492d..1599eb0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,9 +18,8 @@ matrix: - os: linux compiler: clang sudo : true - env: TEST_CLANG_FORMAT="yes" install: ./ci/install-linux.sh && ./ci/log-config.sh - script: ./ci/test_format.sh && ./ci/build-linux-bazel.sh + script: ./ci/build-linux-bazel.sh - os: linux group: deprecated-2017Q4 compiler: gcc @@ -67,7 +66,6 @@ addons: packages: - g++-4.9 - clang-3.9 - - clang-format-3.9 notifications: email: false diff --git a/ci/test_format.sh b/ci/test_format.sh deleted file mode 100755 index 502c84c5..00000000 --- a/ci/test_format.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -echo "clang-format - checking Code Formatting..." - -if [[ "${TRAVIS_OS_NAME}" == "linux" ]] && \ - [[ "${TEST_CLANG_FORMAT}" == "yes" ]]; then - - RETURN=0 - CLANG_FORMAT="clang-format-3.9" - - which clang-format-3.9 - - if [ ! -f ".clang-format" ]; then - echo ".clang-format file not found!" - exit 1 - fi - - FILES=`git diff master --name-only | grep -E "\.(cc|cpp|h)$"` - - for FILE in $FILES; do - - $CLANG_FORMAT $FILE | cmp $FILE >/dev/null - - if [ $? -ne 0 ]; then - echo "[!] Clang-Format Found INCORRECT FORMATTING. Please re-format and re-submit. The following file failed: $FILE" >&2 - RETURN=1 - fi - - done - - exit $RETURN -fi - -exit 0 |