From 75aeba9612d65bf4932ae4f061fab3d1dec1a4bf Mon Sep 17 00:00:00 2001
From: Justin Carpentier <justin.carpentier@inria.fr>
Date: Thu, 20 Feb 2020 12:24:16 +0100
Subject: [PATCH] ci: update travis to also Python 3 correctly
---
.travis.yml | 32 ++++++++++++++++++++++++--------
travis_custom/custom_build | 6 +++++-
2 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e034df2..f5ea843 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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:
diff --git a/travis_custom/custom_build b/travis_custom/custom_build
index 3c7d80e..1351351 100755
--- a/travis_custom/custom_build
+++ b/travis_custom/custom_build
@@ -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
--
GitLab