Repository: parquet-cpp Updated Branches: refs/heads/master d45f4dee8 -> 427fad9ea
PARQUET-626: Disable LLVM toolchain parts of Travis CI build Since llvm.org apt repo was taken offline, this patch triages builds until we sort out an alternative (or remove it altogether for now). Author: Wes McKinney <[email protected]> Closes #114 from wesm/PARQUET-626 and squashes the following commits: 8ae1e67 [Wes McKinney] Disable LLVM toolchain checks for now while llvm.org apt repo is unavailable Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/427fad9e Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/427fad9e Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/427fad9e Branch: refs/heads/master Commit: 427fad9ea672a49efd3756e9a57b10390fb10386 Parents: d45f4de Author: Wes McKinney <[email protected]> Authored: Thu Jun 2 13:36:59 2016 -0700 Committer: Wes McKinney <[email protected]> Committed: Thu Jun 2 13:36:59 2016 -0700 ---------------------------------------------------------------------- .travis.yml | 25 ++++++++++++++++--------- ci/travis_script_cpp.sh | 10 ++++++---- 2 files changed, 22 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/427fad9e/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 4f78601..780d9f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,16 +54,23 @@ matrix: - $TRAVIS_BUILD_DIR/ci/travis_conda_build.sh language: cpp + +# PARQUET-626: revisit llvm toolchain when/if llvm.org apt repo resurfaces + +# before_install: +# - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key|sudo apt-key add - +# - sudo apt-get install -y software-properties-common +# - sudo add-apt-repository -y ppa:george-edison55/cmake-3.x +# - sudo apt-add-repository -y "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 +# main" +# - sudo apt-add-repository -y "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.8 +# main" +# - sudo apt-get update +# - sudo apt-get install -y clang-tidy-3.7 clang-format-3.7 cmake +# - mkdir $TRAVIS_BUILD_DIR/parquet-build +# - pushd $TRAVIS_BUILD_DIR/parquet-build + before_install: -- wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key|sudo apt-key add - -- sudo apt-get install -y software-properties-common -- sudo add-apt-repository -y ppa:george-edison55/cmake-3.x -- sudo apt-add-repository -y "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 - main" -- sudo apt-add-repository -y "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.8 - main" -- sudo apt-get update -- sudo apt-get install -y clang-tidy-3.7 clang-format-3.7 cmake - mkdir $TRAVIS_BUILD_DIR/parquet-build - pushd $TRAVIS_BUILD_DIR/parquet-build http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/427fad9e/ci/travis_script_cpp.sh ---------------------------------------------------------------------- diff --git a/ci/travis_script_cpp.sh b/ci/travis_script_cpp.sh index 16291a9..2e7dcdd 100755 --- a/ci/travis_script_cpp.sh +++ b/ci/travis_script_cpp.sh @@ -7,10 +7,12 @@ set -e pushd $CPP_BUILD_DIR make lint -if [ $TRAVIS_OS_NAME == "linux" ]; then - make check-format - make check-clang-tidy -fi + +# PARQUET-626: disabled check for now +# if [ $TRAVIS_OS_NAME == "linux" ]; then +# make check-format +# make check-clang-tidy +# fi if [ $TRAVIS_OS_NAME == "linux" ]; then make -j4 || exit 1
