Repository: thrift Updated Branches: refs/heads/master 257dceff5 -> 4eb23472b
THRIFT-4071: collapse and remove unnecessary build jobs in Travis CI; ensure WITH_PLUGIN is tested somewhere This closes #1238 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/4eb23472 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/4eb23472 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/4eb23472 Branch: refs/heads/master Commit: 4eb23472b76759843b802bb222d308d408475ab0 Parents: 257dcef Author: James E. King, III <jk...@apache.org> Authored: Wed Apr 5 19:32:27 2017 -0400 Committer: James E. King, III <jk...@apache.org> Committed: Wed Apr 5 19:32:27 2017 -0400 ---------------------------------------------------------------------- .travis.yml | 42 +++++++----------------------------------- 1 file changed, 7 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/4eb23472/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 10c6fd0..a664263 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,46 +47,27 @@ env: BUILD_ARG="-'(binary|header|multiplexed)'" BUILD_ENV="-e CC=clang -e CXX=clang++ -e THRIFT_CROSSTEST_CONCURRENCY=4" - - TEST_NAME="Cross Language Tests (Debian) (Binary, Header, Multiplexed Protocols)" - SCRIPT="cross-test.sh" - BUILD_ARG="-'(binary|header|multiplexed)'" - BUILD_ENV="-e CC=clang -e CXX=clang++ -e THRIFT_CROSSTEST_CONCURRENCY=4" - DISTRO=debian - - TEST_NAME="Cross Language Tests (Compact and JSON Protocols)" SCRIPT="cross-test.sh" BUILD_ARG="-'(compact|json)'" BUILD_ENV="-e CC=clang -e CXX=clang++ -e THRIFT_CROSSTEST_CONCURRENCY=4" - - TEST_NAME="Cross Language Tests (Debian) (Compact and JSON Protocols)" - SCRIPT="cross-test.sh" - BUILD_ARG="-'(compact|json)'" - BUILD_ENV="-e CC=clang -e CXX=clang++ -e THRIFT_CROSSTEST_CONCURRENCY=4" - DISTRO=debian - # TODO: Remove them once migrated to CMake # Autotools builds - TEST_NAME="C C++ C# D Erlang Haxe Go (automake)" SCRIPT="autotools.sh" BUILD_ARG="--without-dart --without-haskell --without-java --without-lua --without-nodejs --without-perl --without-php --without-php_extension --without-python --without-ruby" - - TEST_NAME="C C++ - GCC (automake)" + - TEST_NAME="C C++ Plugin - GCC (automake)" SCRIPT="autotools.sh" - BUILD_ARG="--without-csharp --without-java --without-erlang --without-nodejs --without-lua --without-python --without-perl --without-php --without-php_extension --without-dart --without-ruby --without-haskell --without-go --without-haxe --without-d" + BUILD_ARG="--enable-plugin --without-csharp --without-java --without-erlang --without-nodejs --without-lua --without-python --without-perl --without-php --without-php_extension --without-dart --without-ruby --without-haskell --without-go --without-haxe --without-d" BUILD_ENV="-e CC=gcc -e CXX=g++" - - TEST_NAME="Java Lua PHP Ruby Dart (automake)" + - TEST_NAME="Java Lua PHP Ruby Dart Haskell Node.js Python Perl (automake)" SCRIPT="autotools.sh" - BUILD_ARG="--without-cpp --without-haskell --without-c_glib --without-csharp --without-d --without-erlang --without-go --without-haxe --without-nodejs --without-python --without-perl" - - # These are flaky (due to cabal and npm network/server failures) and also have lengthy output - - TEST_NAME="Haskell Node.js Python Perl (automake)" - SCRIPT="autotools.sh" - BUILD_ARG="--without-cpp --without-c_glib --without-csharp --without-d --without-dart --without-erlang --without-go --without-haxe --without-java --without-lua --without-php --without-php_extension --without-ruby" - - # CMake build - - TEST_NAME="All" + BUILD_ARG="--without-cpp --without-c_glib --without-csharp --without-d --without-erlang --without-go --without-haxe" + # CMake builds - TEST_NAME="All (Debian)" DISTRO=debian @@ -95,23 +76,14 @@ env: BUILD_ARG="-DWITH_PYTHON=OFF -DWITH_JAVA=OFF -DWITH_HASKELL=OFF" BUILD_ENV="-e CC=gcc -e CXX=g++" - - TEST_NAME="C++ (Boost Thread)" - BUILD_LIBS="CPP TESTING TUTORIALS" - BUILD_ARG="-DWITH_BOOSTTHREADS=ON -DWITH_PYTHON=OFF -DWITH_C_GLIB=OFF -DWITH_JAVA=OFF -DWITH_HASKELL=OFF" - - TEST_NAME="C++ (Boost Thread - GCC)" BUILD_LIBS="CPP TESTING TUTORIALS" BUILD_ARG="-DWITH_BOOSTTHREADS=ON -DWITH_PYTHON=OFF -DWITH_C_GLIB=OFF -DWITH_JAVA=OFF -DWITH_HASKELL=OFF" BUILD_ENV="-e CC=gcc -e CXX=g++" - - TEST_NAME="C++ (Std Thread)" - BUILD_LIBS="CPP TESTING TUTORIALS" - BUILD_ARG="-DWITH_STDTHREADS=ON -DCMAKE_CXX_FLAGS='-std=c++11' -DWITH_PYTHON=OFF -DWITH_C_GLIB=OFF -DWITH_JAVA=OFF -DWITH_HASKELL=OFF" - - - TEST_NAME="C++ (Std Thread - GCC)" + - TEST_NAME="C++ Plugin (Std Thread)" BUILD_LIBS="CPP TESTING TUTORIALS" - BUILD_ARG="-DWITH_STDTHREADS=ON -DCMAKE_CXX_FLAGS='-std=c++11' -DWITH_PYTHON=OFF -DWITH_C_GLIB=OFF -DWITH_JAVA=OFF -DWITH_HASKELL=OFF" - BUILD_ENV="-e CC=gcc -e CXX=g++" + BUILD_ARG="-DWITH_PLUGIN=ON -DWITH_STDTHREADS=ON -DWITH_PYTHON=OFF -DWITH_C_GLIB=OFF -DWITH_JAVA=OFF -DWITH_HASKELL=OFF" - TEST_NAME="Compiler (mingw)" BUILD_LIBS=""
