From 6b4e0273ca83cdefad6561bf317183d25a46459b Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 10 Mar 2021 16:43:40 +0100 Subject: [PATCH 1/8] Update several bipedal-locomotion-framework related tags --- cmake/ProjectsTagsStable.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/ProjectsTagsStable.cmake b/cmake/ProjectsTagsStable.cmake index 86fe2b7f8..272c7cfd3 100644 --- a/cmake/ProjectsTagsStable.cmake +++ b/cmake/ProjectsTagsStable.cmake @@ -9,7 +9,7 @@ set_tag(osqp_TAG v0.6.2) set_tag(manif_TAG 0.0.3) set_tag(qhull_TAG v8.0.2) set_tag(CppAD_TAG 20210000.4) -set_tag(casadi 3.5.5.1) +set_tag(casadi 3.5.5.2) # Robotology projects set_tag(YCM_TAG ycm-0.12) From f9fd18403381383697d18dda93a1a081aa2f53f4 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 10 Mar 2021 16:44:13 +0100 Subject: [PATCH 2/8] Update ProjectsTagsUnstable.cmake --- cmake/ProjectsTagsUnstable.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/ProjectsTagsUnstable.cmake b/cmake/ProjectsTagsUnstable.cmake index c94c8738b..89d4eb312 100644 --- a/cmake/ProjectsTagsUnstable.cmake +++ b/cmake/ProjectsTagsUnstable.cmake @@ -9,7 +9,7 @@ set_tag(osqp_TAG v0.6.2) set_tag(manif_TAG 0.0.3) set_tag(qhull_TAG v8.0.2) set_tag(CppAD_TAG 20210000.4) -set_tag(casadi 3.5.5.1) +set_tag(casadi 3.5.5.2) # Robotology projects set_tag(YARP_TAG master) From 65ae6dd6c867a1aa4a0b9559cd7adf3f1b6ed142 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 10 Mar 2021 16:44:49 +0100 Subject: [PATCH 3/8] Update Buildcasadi.cmake --- cmake/Buildcasadi.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Buildcasadi.cmake b/cmake/Buildcasadi.cmake index a7b34cd7c..e3f851561 100644 --- a/cmake/Buildcasadi.cmake +++ b/cmake/Buildcasadi.cmake @@ -9,7 +9,7 @@ find_or_build_package(osqp QUIET) ycm_ep_helper(casadi TYPE GIT STYLE GITHUB - REPOSITORY GiulioRomualdi/casadi.git + REPOSITORY dic-iit/casadi.git TAG feature/support_osqp_0.6.0 COMPONENT external FOLDER src From e3722339b02e6de1b0a4cfe486b831ae62d52e06 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 10 Mar 2021 16:50:11 +0100 Subject: [PATCH 4/8] Update ProjectsTagsStable.cmake --- cmake/ProjectsTagsStable.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/ProjectsTagsStable.cmake b/cmake/ProjectsTagsStable.cmake index 272c7cfd3..d320b8556 100644 --- a/cmake/ProjectsTagsStable.cmake +++ b/cmake/ProjectsTagsStable.cmake @@ -15,3 +15,6 @@ set_tag(casadi 3.5.5.2) set_tag(YCM_TAG ycm-0.12) set_tag(YARP_TAG yarp-3.4) set_tag(yarp-matlab-bindings_TAG yarp-3.4) + +# Temporary workaround for Ubuntu 18.04 spdlog problems +set_tag(bipedal-locomotion-framework_TAG 5b76dc40b0f9e825e29f8de5e100240b9f7d640c) From 33b488429fed43ec5c834a9772f4627825aca1a4 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 10 Mar 2021 16:52:46 +0100 Subject: [PATCH 5/8] Update ci.yml --- .github/workflows/ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00ed97b23..9093d68a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -373,6 +373,13 @@ jobs: # Disable ROBOTOLOGY_USES_PYTHON in macOS cmake -DROBOTOLOGY_USES_OCTAVE:BOOL=OFF -DROBOTOLOGY_USES_PYTHON:BOOL=OFF . + - name: Disable options unsupported on Ubuntu 18.04 + if: contains(matrix.os, '18.04') && contains(matrix.project_tags, 'Unstable') + run: | + cd ${ROBOTOLOGY_SUPERBUILD_SOURCE_DIR} + cd build + cmake -DROBOTOLOGY_ENABLE_DYNAMICS:BOOL=OFF + - name: Configure [Windows] if: contains(matrix.os, 'windows') shell: bash From 6e2337af71d91c64e95ee5f965da3ac86564ae63 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 10 Mar 2021 16:55:18 +0100 Subject: [PATCH 6/8] Update latest.releases.yaml --- releases/latest.releases.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/releases/latest.releases.yaml b/releases/latest.releases.yaml index 85dc519fe..8c6a593d5 100644 --- a/releases/latest.releases.yaml +++ b/releases/latest.releases.yaml @@ -21,8 +21,8 @@ repositories: version: 20210000.4 casadi: type: git - url: https://github.com/GiulioRomualdi/casadi.git - version: 3.5.5.1 + url: https://github.com/dic-iit/casadi.git + version: 3.5.5.2 YCM: type: git url: https://github.com/robotology/ycm.git From 22e43ab75ba9fb45227dcb1d6263c3abda47e218 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 10 Mar 2021 19:26:14 +0100 Subject: [PATCH 7/8] Update Buildcasadi.cmake --- cmake/Buildcasadi.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Buildcasadi.cmake b/cmake/Buildcasadi.cmake index e3f851561..f6866baee 100644 --- a/cmake/Buildcasadi.cmake +++ b/cmake/Buildcasadi.cmake @@ -10,7 +10,7 @@ find_or_build_package(osqp QUIET) ycm_ep_helper(casadi TYPE GIT STYLE GITHUB REPOSITORY dic-iit/casadi.git - TAG feature/support_osqp_0.6.0 + TAG support_osqp_0.6.2 COMPONENT external FOLDER src CMAKE_ARGS -DWITH_IPOPT:BOOL=ON From f049a9228222082e532b53812f411a708c320bf7 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 10 Mar 2021 21:35:29 +0100 Subject: [PATCH 8/8] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9093d68a0..4a1d0aff8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -378,7 +378,7 @@ jobs: run: | cd ${ROBOTOLOGY_SUPERBUILD_SOURCE_DIR} cd build - cmake -DROBOTOLOGY_ENABLE_DYNAMICS:BOOL=OFF + cmake -DROBOTOLOGY_ENABLE_DYNAMICS:BOOL=OFF . - name: Configure [Windows] if: contains(matrix.os, 'windows')