arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject arrow git commit: ARROW-1461: [C++] Restore LLVM apt usage
Date Tue, 05 Sep 2017 16:22:27 GMT
Repository: arrow
Updated Branches:
  refs/heads/master ab328ec85 -> df0ca4e69


ARROW-1461: [C++] Restore LLVM apt usage

This reverts https://github.com/apache/arrow/commit/338a187a96fc58b72a5b8c295f621149fcd76361,
since the apt issues seem to be resolved

Author: Wes McKinney <wes.mckinney@twosigma.com>

Closes #1047 from wesm/restore-llvm-apt and squashes the following commits:

60b7d0eb [Wes McKinney] ARROW-1461: [C++] Restore LLVM apt usage


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/df0ca4e6
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/df0ca4e6
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/df0ca4e6

Branch: refs/heads/master
Commit: df0ca4e69804f371c32701d1de22732bf003413c
Parents: ab328ec
Author: Wes McKinney <wes.mckinney@twosigma.com>
Authored: Tue Sep 5 12:22:23 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Tue Sep 5 12:22:23 2017 -0400

----------------------------------------------------------------------
 .travis.yml                      | 6 +++---
 ci/travis_install_clang_tools.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/df0ca4e6/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index d0ac073..016d111 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,9 +95,9 @@ matrix:
     env: ARROW_TEST_GROUP=integration
     jdk: openjdk7
     before_script:
-    # - source $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
-    # - export CC="clang-4.0"
-    # - export CXX="clang++-4.0"
+    - source $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
+    - export CC="clang-4.0"
+    - export CXX="clang++-4.0"
     - $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh
     script:
     - $TRAVIS_BUILD_DIR/ci/travis_script_integration.sh

http://git-wip-us.apache.org/repos/asf/arrow/blob/df0ca4e6/ci/travis_install_clang_tools.sh
----------------------------------------------------------------------
diff --git a/ci/travis_install_clang_tools.sh b/ci/travis_install_clang_tools.sh
index 6933296..bad1e73 100644
--- a/ci/travis_install_clang_tools.sh
+++ b/ci/travis_install_clang_tools.sh
@@ -19,6 +19,6 @@
 
 wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key|sudo apt-key add -
 sudo apt-add-repository -y \
-     "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-4.0 main"
+     "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-4.0 main"
 sudo apt-get update
 sudo apt-get install clang-4.0 clang-format-4.0 clang-tidy-4.0


Mime
View raw message