Verified Commit 39e669ef authored by Justin Carpentier's avatar Justin Carpentier
Browse files

travis: fix issue with bash

parent 772c7a7e
......@@ -33,22 +33,22 @@ jobs:
- dist: xenial
env:
- BUILD_WITH_COLLISION_SUPPORT=OFF
- TRAVIS_PYTHON_VERSION=2.7
- TRAVIS_PYTHON_VERSION=27
python: 2.7
- dist: trusty
env:
- BUILD_WITH_COLLISION_SUPPORT=ON
- TRAVIS_PYTHON_VERSION=2.7
- TRAVIS_PYTHON_VERSION=27
python: 2.7
- dist: xenial
env:
- BUILD_WITH_COLLISION_SUPPORT=ON
- TRAVIS_PYTHON_VERSION=2.7
- TRAVIS_PYTHON_VERSION=27
python: 2.7
- dist: xenial
env:
- BUILD_WITH_COLLISION_SUPPORT=ON
- TRAVIS_PYTHON_VERSION=3.5
- TRAVIS_PYTHON_VERSION=35
python: 3.5
allow_failures:
......
......@@ -17,7 +17,7 @@ export APT_DEPENDENCIES="doxygen libboost-system-dev libboost-test-dev libboost-
# Add Python dependency
echo "TRAVIS_PYTHON_VERSION=$TRAVIS_PYTHON_VERSION"
if [[ $TRAVIS_PYTHON_VERSION -gt 3 ]]; then
if [[ $TRAVIS_PYTHON_VERSION -gt 30 ]]; then
export APT_DEPENDENCIES=$APT_DEPENDENCIES" libboost-python-dev robotpkg-py35-eigenpy python3.5-dev python-numpy"
else
export APT_DEPENDENCIES=$APT_DEPENDENCIES" libboost-python-dev robotpkg-py27-eigenpy python2.7-dev python-numpy"
......
......@@ -6,7 +6,7 @@ set -x
set -v
# Setup environment variables.
if [[ $TRAVIS_PYTHON_VERSION -gt 3 ]]; then
if [[ $TRAVIS_PYTHON_VERSION -gt 30 ]]; then
export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DPYTHON_EXECUTABLE=$(which python3)"
else
export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DPYTHON_EXECUTABLE=$(which python2)"
......
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