Trying to clean up travis config file.

This commit is contained in:
Davis King 2018-01-17 19:39:24 -05:00
parent 7cd3ebd17f
commit 4a74657586
1 changed files with 23 additions and 69 deletions

View File

@ -1,87 +1,41 @@
language: cpp
packages: &gcc5_pkgs
- gcc-5
- g++-5
- libstdc++6
matrix: matrix:
include: include:
# build and run all tests ###################
- compiler: gcc - language: cpp
compiler:
- gcc
- clang
os: linux
env: env:
- GCC_VER=5
- ADDRESS_MODEL=64
- BUILD_SYSTEM=cmake
- PATH=$HOME/bin:$PATH
- VARIANT=test - VARIANT=test
addons: &ao_gcc5
apt: ###################
sources: - language: cpp
- ubuntu-toolchain-r-test compiler:
packages: *gcc5_pkgs - gcc
# build all examples os: linux
- compiler: gcc
env: env:
- GCC_VER=5
- ADDRESS_MODEL=64
- BUILD_SYSTEM=cmake
- PATH=$HOME/bin:$PATH
- VARIANT=examples - VARIANT=examples
addons: *ao_gcc5
# build the python extension ###################
- compiler: gcc - language: python
python:
- "2.7"
- "3.6"
os: linux
env: env:
- GCC_VER=5
- ADDRESS_MODEL=64
- BUILD_SYSTEM=cmake
- PATH=$HOME/bin:$PATH
- VARIANT=python-api - VARIANT=python-api
addons: &ao_gcc5
apt: ###################
sources: - language: cpp
- ubuntu-toolchain-r-test os: osx
packages:
- *gcc5_pkgs
# build the python3 extension
- compiler: gcc
env:
- GCC_VER=5
- ADDRESS_MODEL=64
- BUILD_SYSTEM=cmake
- PATH=$HOME/bin:$PATH
- VARIANT=python3-api
addons: &ao_gcc5
apt:
sources:
- ubuntu-toolchain-r-test
- virtualenv
packages:
- python3
- python3-pip
- *gcc5_pkgs
- os: osx
osx_image: xcode9.2 osx_image: xcode9.2
env: env:
- VARIANT=test - VARIANT=test
- PATH=$HOME/bin:$PATH
cache:
directories:
- cmake
before_install:
- dlib/travis/before-install.sh
install:
- if [ "$CXX" == "g++" ]; then export CXX=g++-$GCC_VER; export CC=gcc-$GCC_VER; fi
- if [ "$CXX" == "clang++" ]; then export CXX=clang++-$CLANG_VER; export CC=clang-$CLANG_VER; fi
script: script:
- dlib/travis/build-and-test.sh - dlib/travis/build-and-test.sh
#notifications:
# email:
# false