From 067d83a1538d674c371785067bb376952077a63c Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 22 Aug 2019 15:17:13 +0200 Subject: [PATCH 1/7] [Travis] Switch to Bionic and add workaround for urdf_parser_py regression --- .travis.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb078fb0..b57bb3d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,19 @@ sudo: required -dist: trusty +dist: bionic language: cpp cache: ccache addons: apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-5.0 packages: - # gcc - - gcc-5 - - g++-5 # build tools + - build-essentials - cmake3 # libraries - libace-dev - libboost-dev + - libeigen3-dev - libgsl0-dev - libtinyxml-dev @@ -31,11 +27,7 @@ env: - BOT_USER_NAME="LOC2Bot" before_script: - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository ppa:nschloe/eigen-backports -y; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libeigen3-dev; fi - # Force gcc-5 - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then if [ "$CC" == "gcc" ]; then export CC=gcc-5; export CXX=g++-5; fi; fi # Save the url of the repository and the user-name of the committ author - export CURRENT_REPOSITORY_URL=`git remote get-url origin` - COMMIT_AUTHOR="$(git --no-pager show -s --format='%an <%ae>' $TRAVIS_COMMIT)" @@ -48,6 +40,8 @@ before_script: # install urdf_parser_py and save the last commit SHA1 hash - git clone $URDF_PARSER_PY_REPOSITORY_URL - cd urdf_parser_py + # workaround for https://github.com/robotology/simmechanics-to-urdf/issues/36 + - git checkout 31474b9baaf7c3845b40e5a9aa87d5900a2282c3 - export URDF_PARSER_PY_COMMIT=`git rev-parse HEAD` - sudo python setup.py install - cd ../ @@ -132,10 +126,10 @@ before_script: - sudo cmake --build . --target install - cd ../.. # Install sdformat - - sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu trusty main" > /etc/apt/sources.list.d/gazebo-latest.list' + - sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu bionic main" > /etc/apt/sources.list.d/gazebo-latest.list' - wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add - - sudo apt-get update - - sudo apt-get install --assume-yes --force-yes libsdformat4-dev + - sudo apt-get install --assume-yes --force-yes libsdformat6-dev # Prepare icub-model-generator build - cd icub-model-generator - mkdir build From eec849ae6598ae6552f944156c58ab0336bbe510 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 22 Aug 2019 15:27:32 +0200 Subject: [PATCH 2/7] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b57bb3d8..f8e3b7be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ addons: apt: packages: # build tools - - build-essentials - - cmake3 + - build-essential + - cmake # libraries - libace-dev - libboost-dev From 30c1c5eaf8ec336f794eb99d799734336520534f Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 28 Aug 2019 17:17:09 +0200 Subject: [PATCH 3/7] Fix COMMIT_AUTHOR command --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f8e3b7be..3c2641f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ before_script: - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update; fi # Save the url of the repository and the user-name of the committ author - export CURRENT_REPOSITORY_URL=`git remote get-url origin` - - COMMIT_AUTHOR="$(git --no-pager show -s --format='%an <%ae>' $TRAVIS_COMMIT)" + - COMMIT_AUTHOR="$(git --no-pager show -s --format='%an <%ae>')" # Start in the parent directory of icub-model-generator - cd .. - sudo apt-get install --assume-yes --force-yes python-lxml python-yaml python-numpy python-setuptools From e0fbb98d1101efa92a76c2837b1a21e916e73333 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 28 Aug 2019 18:05:36 +0200 Subject: [PATCH 4/7] Disable ccache to avoid ccache related errors migrating from trusty to bionic --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3c2641f4..f1f714d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ sudo: required dist: bionic language: cpp -cache: ccache +#cache: ccache addons: From f2a4ce27f171543e7f8b4d2d6c8e2b77eec66da0 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 28 Aug 2019 19:23:19 +0200 Subject: [PATCH 5/7] Workaround bug in urdfdom cmake config file The urdfdomConfig.cmake should contain a call to `find_package(console_bridge)`. --- dh/generator/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dh/generator/CMakeLists.txt b/dh/generator/CMakeLists.txt index cfc4b74d..f7fd73db 100644 --- a/dh/generator/CMakeLists.txt +++ b/dh/generator/CMakeLists.txt @@ -5,6 +5,7 @@ find_package(YCM REQUIRED) find_package(YARP 3.0 REQUIRED COMPONENTS OS dev sig math gsl) find_package(ICUB REQUIRED) +find_package(console_bridge REQUIRED) find_package(urdfdom REQUIRED) find_package(orocos_kdl REQUIRED) find_package(Eigen3 REQUIRED) From 1fafc9d6e86524a6a02ee82f595e477134ca8cd5 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 11 Sep 2019 12:01:45 +0200 Subject: [PATCH 6/7] Switch to use Ubuntu 18.04 official versions of orocos_kdl and urdfdom --- .travis.yml | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index f1f714d4..340101d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,10 @@ addons: - libeigen3-dev - libgsl0-dev - libtinyxml-dev + - liborocos-kdl + - libconsole-bridge-dev + - liburdfdom-headers-dev + - liburdfdom-dev env: global: @@ -75,38 +79,6 @@ before_script: - cmake .. - sudo cmake --build . --target install - cd ../.. - ## orocos_kdl - - git clone https://github.com/orocos/orocos_kinematics_dynamics - - cd orocos_kinematics_dynamics/orocos_kdl - - mkdir build - - cd build - - cmake .. - - sudo cmake --build . --target install - - cd ../../.. - ## console_bridge - - git clone https://github.com/ros/console_bridge - - cd console_bridge - - mkdir build - - cd build - - cmake .. - - sudo cmake --build . --target install - - cd ../.. - # urdfdom_headers - - git clone https://github.com/ros/urdfdom_headers - - cd urdfdom_headers - - mkdir build - - cd build - - cmake .. - - sudo cmake --build . --target install - - cd ../.. - # urdfdom - - git clone https://github.com/ros/urdfdom - - cd urdfdom - - mkdir build - - cd build - - cmake .. - - sudo cmake --build . --target install - - cd ../.. ## idyntree - git clone https://github.com/robotology/idyntree.git - cd idyntree From 4b95f4c056728bdb4ffcd4c9bec6b0ab792ae2ab Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 11 Sep 2019 18:36:47 +0200 Subject: [PATCH 7/7] Fix typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 340101d9..b1392591 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ addons: - libeigen3-dev - libgsl0-dev - libtinyxml-dev - - liborocos-kdl + - liborocos-kdl-dev - libconsole-bridge-dev - liburdfdom-headers-dev - liburdfdom-dev