From 30d8c5cf1fc03d6746ce412443d0a7eb79f43a4e Mon Sep 17 00:00:00 2001 From: Wes McKinney Date: Thu, 2 Jun 2016 13:45:04 -0700 Subject: [PATCH 1/2] Temporarily disable clang-format and clang-tidy checks in Travis CI build --- .travis.yml | 1 - ci/travis_script_cpp.sh | 12 ++++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7c4183700ca..31112c6ea2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ addons: sources: - ubuntu-toolchain-r-test - kalakris-cmake - - llvm-toolchain-precise-3.7 packages: - clang-format-3.7 - clang-tidy-3.7 diff --git a/ci/travis_script_cpp.sh b/ci/travis_script_cpp.sh index c9b3b5f1442..9cf4f8e3521 100755 --- a/ci/travis_script_cpp.sh +++ b/ci/travis_script_cpp.sh @@ -7,10 +7,14 @@ set -e pushd $CPP_BUILD_DIR make lint -if [ $TRAVIS_OS_NAME == "linux" ]; then - make check-format - make check-clang-tidy -fi + +# ARROW-209: checks depending on the LLVM toolchain are disabled temporarily +# until we are able to install the full LLVM toolchain in Travis CI again + +# if [ $TRAVIS_OS_NAME == "linux" ]; then +# make check-format +# make check-clang-tidy +# fi ctest -L unittest From c6bf1665ec3101ba279ae42cabc47a2c478f26fb Mon Sep 17 00:00:00 2001 From: Wes McKinney Date: Thu, 2 Jun 2016 13:53:10 -0700 Subject: [PATCH 2/2] Remove clang-* packages from apt list --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31112c6ea2b..ac2b0d457cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,6 @@ addons: - ubuntu-toolchain-r-test - kalakris-cmake packages: - - clang-format-3.7 - - clang-tidy-3.7 - gcc-4.9 # Needed for C++11 - g++-4.9 # Needed for C++11 - gdb