| OLD | NEW |
| 1 sudo: required | 1 sudo: required |
| 2 | 2 |
| 3 services: | 3 services: |
| 4 - docker | 4 - docker |
| 5 | 5 |
| 6 language: cpp | 6 language: cpp |
| 7 | 7 |
| 8 os: | 8 os: |
| 9 - linux | 9 - linux |
| 10 - osx | 10 - osx |
| 11 | 11 |
| 12 dist: trusty | 12 dist: trusty |
| 13 | 13 |
| 14 python: '2.7' | 14 python: '2.7' |
| 15 | 15 |
| 16 env: | 16 env: |
| 17 matrix: | 17 matrix: |
| 18 - BUILDTYPE=release | 18 - BUILDTYPE=release |
| 19 - BUILDTYPE=debug | 19 - BUILDTYPE=debug |
| 20 | 20 |
| 21 install: | 21 install: |
| 22 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python3; fi | 22 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python; fi |
| 23 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python2 && brew link
--force python2; fi |
| 23 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH=/usr/local/opt/python/
libexec/bin:${PATH}; fi | 24 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH=/usr/local/opt/python/
libexec/bin:${PATH}; fi |
| 24 - if [[ "$TRAVIS_OS_NAME" != "linux" ]]; then bash .travis/travis-install.sh;
fi | 25 - if [[ "$TRAVIS_OS_NAME" != "linux" ]]; then bash .travis/travis-install.sh;
fi |
| 25 | 26 |
| 26 before_script: | 27 before_script: |
| 27 - if [[ "$TRAVIS_OS_NAME" != "linux" ]]; then bash .travis/travis-before_scrip
t.sh; fi | 28 - if [[ "$TRAVIS_OS_NAME" != "linux" ]]; then bash .travis/travis-before_scrip
t.sh; fi |
| 28 | 29 |
| 29 script: | 30 script: |
| 30 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash .travis/prepare-docker.sh;
else bash .travis/travis-script.sh; fi | 31 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash .travis/prepare-docker.sh;
else bash .travis/travis-script.sh; fi |
| 31 | 32 |
| 32 notifications: | 33 notifications: |
| 33 email: false | 34 email: false |
| OLD | NEW |