diff options
| author | Jisi Liu <liujisi@google.com> | 2015-10-06 14:13:01 -0700 |
|---|---|---|
| committer | Jisi Liu <liujisi@google.com> | 2015-10-06 14:13:01 -0700 |
| commit | 878b603d328697a027264c3f195df9b5981a4129 (patch) | |
| tree | af429ac9c51f94bb0078caca3e75b6a590edfb30 /travis.sh | |
| parent | 9cafa201224e6699d247e8e8193319303df38a34 (diff) | |
| parent | 5f6a1d3dbbd21b490bd5e429c7582950e29b3198 (diff) | |
| download | protobuf-878b603d328697a027264c3f195df9b5981a4129.tar.gz protobuf-878b603d328697a027264c3f195df9b5981a4129.tar.bz2 protobuf-878b603d328697a027264c3f195df9b5981a4129.zip | |
Merge pull request #849 from pherl/master
Integrate google internal changes.
Diffstat (limited to 'travis.sh')
| -rwxr-xr-x | travis.sh | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -131,7 +131,8 @@ build_python() { cd python # Only test Python 2.6/3.x on Linux if [ $(uname -s) == "Linux" ]; then - envlist=py\{26,27,33,34\}-python + # py26 is currently disabled due to json_format + envlist=py\{27,33,34\}-python else envlist=py27-python fi @@ -147,7 +148,8 @@ build_python_cpp() { cd python # Only test Python 2.6/3.x on Linux if [ $(uname -s) == "Linux" ]; then - envlist=py\{26,27,33,34\}-cpp + # py26 is currently disabled due to json_format + envlist=py\{27,33,34\}-cpp else envlist=py27-cpp fi |