Commit 08371586 authored by Justin Carpentier's avatar Justin Carpentier Committed by GitHub

Merge pull request #871 from jcarpent/travis

travis: add bionic
parents 92f94eb4 d7b878b1
......@@ -29,12 +29,14 @@ branches:
jobs:
include:
- dist: xenial
- dist: bionic
env: BUILD_WITH_COLLISION_SUPPORT=OFF
- dist: trusty
env: BUILD_WITH_COLLISION_SUPPORT=ON
- dist: xenial
env: BUILD_WITH_COLLISION_SUPPORT=ON
- dist: bionic
env: BUILD_WITH_COLLISION_SUPPORT=ON
allow_failures:
- compiler:
......@@ -45,7 +47,7 @@ install:
script:
- export CMAKE_ADDITIONAL_OPTIONS="-DCMAKE_BUILD_TYPE=${BUILDTYPE} -DBUILD_WITH_COLLISION_SUPPORT=${BUILD_WITH_COLLISION_SUPPORT}"
- sudo free -m -t
- travis_wait 50 ./.travis/run ../travis_custom/custom_build
- travis_wait 60 ./.travis/run ../travis_custom/custom_build
after_failure: ./.travis/run after_failure
after_success:
- ./.travis/run after_success
......
......@@ -13,8 +13,10 @@ else
export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DINSTALL_DOCUMENTATION=\"ON\""
fi
export CMAKE_ADDITIONAL_OPTIONS="${CMAKE_ADDITIONAL_OPTIONS} -DDISABLE_DEPRECATED_MACRO_WARNING=\"ON\""
export CMAKE_ADDITIONAL_OPTIONS="${CMAKE_ADDITIONAL_OPTIONS} -DCMAKE_CXX_FLAGS_DEBUG=\"-O1\""
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/openrobots/lib/pkgconfig"
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/openrobots/lib"
export MAKEFLAGS="-j2"
# 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