Skip to content

Commit c61f882

Browse files
pcmoritzkou
authored andcommitted
ARROW-3659: [CI] Fix Travis matrix entry 2 documentation to use gcc
This is a little subtle and is needed because of the order in which Travis evaluates the command line variable definitions (see the JIRA issue). I also needed to remove a warning due to this: cython/cython#2269 We might be able to bring the warning back once we can depend on cython with cython/cython#2669 Author: Philipp Moritz <pcmoritz@gmail.com> Closes #2878 from pcmoritz/use-clang and squashes the following commits: d41c66c <Philipp Moritz> update a42c141 <Philipp Moritz> install clang tools 60961df <Philipp Moritz> use clang in build matrix 2
1 parent 8cc92f4 commit c61f882

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ matrix:
6262
- $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
6363
script:
6464
- $TRAVIS_BUILD_DIR/ci/travis_lint.sh
65-
# C++ & Python w/ clang 6.0
65+
# C++ & Python w/ gcc 4.9
6666
- compiler: gcc
6767
language: cpp
6868
os: linux
@@ -80,8 +80,7 @@ matrix:
8080
- ARROW_TRAVIS_JAVA_BUILD_ONLY=1
8181
# ARROW-2999 Benchmarks are disabled in Travis CI for the time being
8282
# - ARROW_TRAVIS_PYTHON_BENCHMARKS=1
83-
- CC="clang-6.0"
84-
- CXX="clang++-6.0"
83+
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
8584
before_script:
8685
# (ARROW_CI_CPP_AFFECTED implies ARROW_CI_PYTHON_AFFECTED)
8786
- if [ $ARROW_CI_PYTHON_AFFECTED != "1" ]; then exit; fi

0 commit comments

Comments
 (0)