mirror of
https://github.com/tristanpenman/valijson.git
synced 2024-12-13 10:32:58 +01:00
Remove non-C++11 and gcc 4.9 stages from Travis CI build script
This commit is contained in:
parent
38e6b05afa
commit
b698164ebe
@ -4,14 +4,6 @@ dist: trusty
|
||||
|
||||
matrix:
|
||||
include:
|
||||
- os: linux
|
||||
compiler: gcc
|
||||
addons:
|
||||
apt:
|
||||
sources: ['ubuntu-toolchain-r-test']
|
||||
packages: ['g++-4.9', 'valgrind', 'python-pip', 'python-yaml']
|
||||
env: COMPILER=g++-4.9
|
||||
|
||||
- os: linux
|
||||
compiler: gcc
|
||||
addons:
|
||||
|
16
travis.sh
16
travis.sh
@ -26,22 +26,10 @@ if [[ $CXX == 'clang++' ]]; then
|
||||
echo "Additional flags to pass to cmake: $CMAKE_FLAGS"
|
||||
fi
|
||||
|
||||
echo "Attempting to build and run test suite with C++11 support disabled..."
|
||||
cmake $CMAKE_FLAGS -DVALIJSON_CXX11_ADAPTERS=disabled ..
|
||||
echo "Attempting to build and run test suite with C++11 support enabled..."
|
||||
cmake $CMAKE_FLAGS -DVALIJSON_CXX11_ADAPTERS=enabled ..
|
||||
VERBOSE=1 make
|
||||
./test_suite
|
||||
|
||||
echo "Checking if current compiler is GCC..."
|
||||
if [[ $CXX == 'g++' ]]; then
|
||||
echo "Not building test suite with C++11 support due to ancient version of GCC on Travis CI"
|
||||
else
|
||||
echo "Attempting to build and run test suite with C++11 support enabled..."
|
||||
make clean
|
||||
cmake $CMAKE_FLAGS -DVALIJSON_CXX11_ADAPTERS=enabled ..
|
||||
VERBOSE=1 make
|
||||
./test_suite
|
||||
fi
|
||||
|
||||
make clean
|
||||
|
||||
popd > /dev/null
|
||||
|
Loading…
Reference in New Issue
Block a user