Verified Commit 75aeba96 authored by Justin Carpentier's avatar Justin Carpentier
Browse files

ci: update travis to also Python 3 correctly

parent 1a53552c
......@@ -20,28 +20,44 @@ env:
jobs:
include:
- dist: bionic
env: BUILDTYPE=Release
env:
- BUILDTYPE=Release
- TRAVIS_PYTHON_VERSION=27
python: 2.7
- dist: bionic
env: BUILDTYPE=Release
env:
- BUILDTYPE=Release
- TRAVIS_PYTHON_VERSION=36
python: 3.6
- dist: bionic
env: BUILDTYPE=Debug
env:
- BUILDTYPE=Debug
- TRAVIS_PYTHON_VERSION=27
python: 2.7
- dist: bionic
env: BUILDTYPE=Debug
env:
- BUILDTYPE=Debug
- TRAVIS_PYTHON_VERSION=36
python: 3.6
- dist: xenial
env: BUILDTYPE=Release
env:
- BUILDTYPE=Release
- TRAVIS_PYTHON_VERSION=27
python: 2.7
- dist: xenial
env: BUILDTYPE=Release
env:
- BUILDTYPE=Release
- TRAVIS_PYTHON_VERSION=35
python: 3.5
- dist: trusty
env: BUILDTYPE=Release
env:
- BUILDTYPE=Release
- TRAVIS_PYTHON_VERSION=27
python: 2.7
- dist: trusty
env: BUILDTYPE=Release
env:
- BUILDTYPE=Release
- TRAVIS_PYTHON_VERSION=34
python: 3.4
notifications:
......
......@@ -2,13 +2,17 @@
set -e
# Setup environment variables.
export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DBUILD_BENCHMARK=\"ON\" -DBUILD_UNIT_TESTS=\"ON\" -DCMAKE_CXX_FLAGS=-DBOOST_SYSTEM_NO_DEPRECATED -DPYTHON_EXECUTABLE=$(which python)"
export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DBUILD_BENCHMARK=\"ON\" -DBUILD_UNIT_TESTS=\"ON\" -DCMAKE_CXX_FLAGS=-DBOOST_SYSTEM_NO_DEPRECATED"
if [[ ";${DO_INSTALL_DOC_EXCEPT_ON_BRANCH};" == *";${CI_BRANCH};"* ]]; then
export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DINSTALL_DOCUMENTATION=\"OFF\""
else
export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DINSTALL_DOCUMENTATION=\"ON\""
fi
if [[ $TRAVIS_PYTHON_VERSION -gt 30 ]]; then
export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DPYTHON_EXECUTABLE=$(which python3)"
fi
# Setup environment variables.
. ./.travis/run ../.travis/build
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment