diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index c48df0876..dfbefa790 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,6 @@ os: - linux - osx -compiler: - - clang - - gcc - env: - AUTOMATION=cmake CI_NO_TEST=1 - AUTOMATION=cmake CI_CMAKE_VARS="-DPNG_HARDWARE_OPTIMIZATIONS=ON" CI_SANITIZERS="address,undefined" @@ -26,20 +22,14 @@ env: matrix: include: - os: osx - compiler: cc env: AUTOMATION=cmake CI_CMAKE_GENERATOR=Xcode - exclude: - - os: freebsd - compiler: gcc - - os: osx - compiler: gcc before_script: + - 'if test "$TRAVIS_OS_NAME" = "linux"; then COMPILER="gcc"; else COMPILER="clang"; fi' + - 'export CI_MAKEFILES="scripts/makefile.std scripts/makefile.$COMPILER"' + - 'export CI_MAKE_FLAGS="-j2"' - 'export CI_CMAKE_BUILD_FLAGS="--parallel 2"' - 'export CI_CTEST_FLAGS="--parallel 2"' - - 'export CI_MAKE_FLAGS=-j2' - - 'export CI_CC=$TRAVIS_COMPILER' - - 'export CI_MAKEFILES="scripts/makefile.$TRAVIS_COMPILER scripts/makefile.std"' script: - './ci/ci_verify_$AUTOMATION.sh' |