generic-library/valijson
1
0
Fork 0
mirror of https://github.com/tristanpenman/valijson.git synced 2024-12-14 02:57:45 +01:00
Code Issues Projects Releases Wiki Activity

Remove non-C++11 and gcc 4.9 stages from Travis CI build script

Browse Source
This commit is contained in:
Tristan Penman 2016-08-06 12:38:27 -07:00
parent 38e6b05afa
commit b698164ebe
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -4,14 +4,6 @@ dist: trusty
matrix: matrix:
include: 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 - os: linux
compiler: gcc compiler: gcc
addons: addons:

16
travis.sh
View File

@ -26,22 +26,10 @@ if [[ $CXX == 'clang++' ]]; then
echo "Additional flags to pass to cmake: $CMAKE_FLAGS" echo "Additional flags to pass to cmake: $CMAKE_FLAGS"
fi fi
echo "Attempting to build and run test suite with C++11 support disabled..." echo "Attempting to build and run test suite with C++11 support enabled..."
cmake $CMAKE_FLAGS -DVALIJSON_CXX11_ADAPTERS=disabled .. cmake $CMAKE_FLAGS -DVALIJSON_CXX11_ADAPTERS=enabled ..
VERBOSE=1 make VERBOSE=1 make
./test_suite ./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 make clean
popd > /dev/null popd > /dev/null