Skip to content
Snippets Groups Projects
Commit 2379f42f authored by Joseph Mirabel's avatar Joseph Mirabel
Browse files

[CI] Update CI + stop 14.04 on travis.

parent b9e179d6
No related branches found
No related tags found
Loading
...@@ -22,7 +22,7 @@ jobs: ...@@ -22,7 +22,7 @@ jobs:
sudo rm -rf /usr/local/share/boost/1.69.0 sudo rm -rf /usr/local/share/boost/1.69.0
export APT_DEPENDENCIES="doxygen libboost-system-dev libboost-test-dev libboost-filesystem-dev libboost-program-options-dev libeigen3-dev liburdfdom-dev texlive-font-utils" export APT_DEPENDENCIES="doxygen libboost-system-dev libboost-test-dev libboost-filesystem-dev libboost-program-options-dev libeigen3-dev liburdfdom-dev texlive-font-utils"
export APT_DEPENDENCIES=$APT_DEPENDENCIES" libboost-python-dev robotpkg-py27-eigenpy python2.7-dev python-numpy" export APT_DEPENDENCIES=$APT_DEPENDENCIES" libboost-python-dev robotpkg-py27-eigenpy python2.7-dev python-numpy"
export APT_DEPENDENCIES=$APT_DEPENDENCIES" robotpkg-hpp-fcl" export APT_DEPENDENCIES=$APT_DEPENDENCIES" robotpkg-py27-hpp-fcl robotpkg-hpp-fcl"
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -qq curl cppcheck ${APT_DEPENDENCIES} sudo apt-get install -qq curl cppcheck ${APT_DEPENDENCIES}
- name: Run cmake - name: Run cmake
...@@ -30,6 +30,7 @@ jobs: ...@@ -30,6 +30,7 @@ jobs:
git submodule update --init git submodule update --init
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/openrobots/lib/pkgconfig export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/openrobots/lib/pkgconfig
export PATH=$PATH:/opt/openrobots/bin export PATH=$PATH:/opt/openrobots/bin
export PYTHONPATH=${PYTHONPATH}:/opt/openrobots/lib/python2.7/site-packages
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/openrobots/lib:/usr/local/lib:/usr/lib:/usr/lib/x86_64-linux-gnu export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/openrobots/lib:/usr/local/lib:/usr/lib:/usr/lib/x86_64-linux-gnu
export MAKEFLAGS="-j2" export MAKEFLAGS="-j2"
mkdir build mkdir build
......
...@@ -31,21 +31,19 @@ jobs: ...@@ -31,21 +31,19 @@ jobs:
env: env:
- BUILD_WITH_COLLISION_SUPPORT=OFF - BUILD_WITH_COLLISION_SUPPORT=OFF
- TRAVIS_PYTHON_VERSION=27 - TRAVIS_PYTHON_VERSION=27
python: 2.7 - TRAVIS_PYTHON_VERSION_WITH_DOT=2.7
- dist: trusty
env:
- BUILD_WITH_COLLISION_SUPPORT=ON
- TRAVIS_PYTHON_VERSION=27
python: 2.7 python: 2.7
- dist: xenial - dist: xenial
env: env:
- BUILD_WITH_COLLISION_SUPPORT=ON - BUILD_WITH_COLLISION_SUPPORT=ON
- TRAVIS_PYTHON_VERSION=27 - TRAVIS_PYTHON_VERSION=27
- TRAVIS_PYTHON_VERSION_WITH_DOT=2.7
python: 2.7 python: 2.7
- dist: xenial - dist: xenial
env: env:
- BUILD_WITH_COLLISION_SUPPORT=ON - BUILD_WITH_COLLISION_SUPPORT=ON
- TRAVIS_PYTHON_VERSION=35 - TRAVIS_PYTHON_VERSION=35
- TRAVIS_PYTHON_VERSION_WITH_DOT=3.5
python: 3.5 python: 3.5
before_install: ./travis_custom/custom_before_install before_install: ./travis_custom/custom_before_install
......
...@@ -8,6 +8,7 @@ set -v ...@@ -8,6 +8,7 @@ set -v
# Add robotpkg # Add robotpkg
sudo sh -c "echo \"deb [arch=amd64] http://robotpkg.openrobots.org/packages/debian/pub $(lsb_release -cs) robotpkg\" >> /etc/apt/sources.list " sudo sh -c "echo \"deb [arch=amd64] http://robotpkg.openrobots.org/packages/debian/pub $(lsb_release -cs) robotpkg\" >> /etc/apt/sources.list "
curl http://robotpkg.openrobots.org/packages/debian/robotpkg.key | sudo apt-key add - curl http://robotpkg.openrobots.org/packages/debian/robotpkg.key | sudo apt-key add -
sudo apt update
# show memory usage before install # show memory usage before install
sudo free -m -t sudo free -m -t
...@@ -24,9 +25,9 @@ else ...@@ -24,9 +25,9 @@ else
fi fi
# Add Geometry dependencies # Add Geometry dependencies
if [[ $BUILD_WITH_COLLISION_SUPPORT -eq ON ]]; then if [[ $BUILD_WITH_COLLISION_SUPPORT -eq ON ]]; then
export APT_DEPENDENCIES=$APT_DEPENDENCIES" robotpkg-hpp-fcl" export APT_DEPENDENCIES=$APT_DEPENDENCIES" robotpkg-hpp-fcl robotpkg-py${TRAVIS_PYTHON_VERSION}-hpp-fcl"
fi fi
# When this script is called the current directory is ./custom_travis # When this script is called the current directory is ./custom_travis
. ./.travis/run ../.travis/before_install . ./.travis/run ../.travis/before_install
......
...@@ -19,6 +19,7 @@ export CMAKE_ADDITIONAL_OPTIONS="${CMAKE_ADDITIONAL_OPTIONS} -DDISABLE_DEPRECATE ...@@ -19,6 +19,7 @@ export CMAKE_ADDITIONAL_OPTIONS="${CMAKE_ADDITIONAL_OPTIONS} -DDISABLE_DEPRECATE
export CMAKE_ADDITIONAL_OPTIONS="${CMAKE_ADDITIONAL_OPTIONS} -DCMAKE_CXX_FLAGS_DEBUG=\"-O1\"" export CMAKE_ADDITIONAL_OPTIONS="${CMAKE_ADDITIONAL_OPTIONS} -DCMAKE_CXX_FLAGS_DEBUG=\"-O1\""
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/openrobots/lib/pkgconfig" export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/openrobots/lib/pkgconfig"
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/openrobots/lib" export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/openrobots/lib"
export PYTHONPATH="${PYTHONPATH}:/opt/openrobots/lib/python${TRAVIS_PYTHON_VERSION_WITH_DOT}/site-packages"
export MAKEFLAGS="-j2" export MAKEFLAGS="-j2"
# Setup environment variables. # Setup environment variables.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment