summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorNobuaki Sukegawa <nsuke@apache.org>2016-02-28 13:47:44 +0900
committerNobuaki Sukegawa <nsuke@apache.org>2016-03-06 09:46:22 +0900
commited23b2b4ce796602ac073ec07582b9a19f5f02e4 (patch)
tree9f36e1deb7b3e075926f7535f1740d1e98647b58 /.travis.yml
parent5fb1fda25a44f405c991cf8e024697bd0b06eb4f (diff)
downloadthrift-ed23b2b4ce796602ac073ec07582b9a19f5f02e4.tar.gz
THRIFT-3696 Install pip to CentOS Docker images to fix Python builds
This closes #912
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 6b9996592..10da1f93a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -110,14 +110,14 @@ env:
BUILD_ARG="-DCMAKE_TOOLCHAIN_FILE=../build/cmake/mingw32-toolchain.cmake -DBUILD_COMPILER=ON -DBUILD_LIBRARIES=OFF -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF"
BUILD_ENV=""
- - TEST_NAME="All (CentOS)"
+ - TEST_NAME="All - GCC (CentOS)"
BUILD_CMD="../cmake.sh"
+ BUILD_ENV="-e CC=gcc -e CXX=g++"
DISTRO=centos
- - TEST_NAME="C C++ - GCC (CentOS)"
+ - TEST_NAME="C C++ - Clang (CentOS)"
BUILD_CMD="../cmake.sh"
BUILD_ARG="-DWITH_PYTHON=OFF -DWITH_JAVA=OFF -DWITH_HASKELL=OFF"
- BUILD_ENV="-e CC=gcc -e CXX=g++"
DISTRO=centos
- TEST_NAME="Python 2.6 (CentOS 6)"