From 0a934afd0fe56e4500ac2e05e898b2cbb591730c Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 5 Oct 2021 16:15:20 +0200 Subject: [PATCH 1/4] Disable ROBOTOLOGY_ENABLE_ROBOT_TESTING and ROBOTOLOGY_USES_PYTHON on Ubuntu 18.04 with apt --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f916f9d8..3bea2b409 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -219,13 +219,13 @@ jobs: if: (matrix.docker_image == 'debian:sid' || matrix.docker_image == 'debian:buster-backports' || matrix.docker_image == 'ubuntu:bionic') run: | cd build - cmake -DROBOTOLOGY_ENABLE_DYNAMICS_FULL_DEPS:BOOL=OFF . + cmake -DROBOTOLOGY_ENABLE_DYNAMICS_FULL_DEPS:BOOL=OFF -DROBOTOLOGY_ENABLE_ROBOT_TESTING:BOOL=OFF -DROBOTOLOGY_USES_PYTHON:BOOL=OFF . - name: Disable profiles that are not supported in Ubuntu Bionic [Docker ubuntu:bionic] if: (matrix.docker_image == 'ubuntu:bionic') run: | cd build - cmake -DROBOTOLOGY_ENABLE_DYNAMICS_FULL_DEPS:BOOL=OFF . + cmake -DROBOTOLOGY_ENABLE_DYNAMICS_FULL_DEPS:BOOL=OFF -DROBOTOLOGY_ENABLE_ROBOT_TESTING:BOOL=OFF -DROBOTOLOGY_USES_PYTHON:BOOL=OFF . - name: Build [Docker] run: | @@ -406,7 +406,7 @@ jobs: run: | cd ${ROBOTOLOGY_SUPERBUILD_SOURCE_DIR} cd build - cmake -DROBOTOLOGY_ENABLE_DYNAMICS_FULL_DEPS:BOOL=OFF . + cmake -DROBOTOLOGY_ENABLE_DYNAMICS_FULL_DEPS:BOOL=OFF -DROBOTOLOGY_ENABLE_ROBOT_TESTING:BOOL=OFF -DROBOTOLOGY_USES_PYTHON:BOOL=OFF . - name: Configure [Windows] if: contains(matrix.os, 'windows') From 2d4bc55d6f9c234d955692893fc7cd6c9a919e14 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 5 Oct 2021 16:18:54 +0200 Subject: [PATCH 2/4] Document options that are not supported anymore on Ubuntu 18.04 with apt dependencies --- doc/cmake-options.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/cmake-options.md b/doc/cmake-options.md index 6d822bbf4..e2b78a51c 100644 --- a/doc/cmake-options.md +++ b/doc/cmake-options.md @@ -79,7 +79,7 @@ Not all options are supported on all platforms. The following table provides a r | Option | Ubuntu/Debian, dependencies: apt | macOS, dependencies: Homebrew | Windows, dependencies: vcpkg | conda on Linux, dependencies: conda-forge | conda on macOS, dependencies: conda-forge | conda on Windows, dependencies: conda-forge | |:------:|:---------------------------------:|:----------------------------:|:-----------------------------:|:--------------------------------:|:-----------------------------:|:--------------------------------:| | `ROBOTOLOGY_ENABLE_CORE` | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | -| `ROBOTOLOGY_ENABLE_ROBOT_TESTING` | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | +| `ROBOTOLOGY_ENABLE_ROBOT_TESTING`[2!](#f2) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | | `ROBOTOLOGY_ENABLE_DYNAMICS` | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | | `ROBOTOLOGY_ENABLE_DYNAMICS_FULL_DEPS`[1!](#f1) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | | `ROBOTOLOGY_ENABLE_ICUB_HEAD` | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | @@ -91,7 +91,7 @@ Not all options are supported on all platforms. The following table provides a r | `ROBOTOLOGY_USES_IGNITION` | ❌ | ❌ | ❌ | ✔️ | ❌ | ❌ | | `ROBOTOLOGY_USES_MATLAB` | ✔️ | ✔️ | ❌ | ✔️ | ✔️ | ✔️ | | `ROBOTOLOGY_USES_OCTAVE` | ✔️ | ✔️ | ❌ | ❌ | ❌ | ❌ | -| `ROBOTOLOGY_USES_PYTHON` | ✔️ | ❌ | ❌ | ✔️ | ✔️ | ✔️ | +| `ROBOTOLOGY_USES_PYTHON`[3!](#f3) | ✔️ | ❌ | ❌ | ✔️ | ✔️ | ✔️ | | `ROBOTOLOGY_USES_OCULUS_SDK` | ❌ | ❌ | ✔️ | ❌ | ❌ | ❌ | | `ROBOTOLOGY_USES_CYBERITH_SDK` | ❌ | ❌ | ✔️ | ❌ | ❌ | ✔️ | | `ROBOTOLOGY_USES_CFW2CAN` | ✔️ | ❌ | ❌ | ✔️ | ❌ | ❌ | @@ -100,6 +100,10 @@ Not all options are supported on all platforms. The following table provides a r 1!:Since 2021.05, `ROBOTOLOGY_ENABLE_DYNAMICS_FULL_DEPS` does not support building with apt dependencies on Ubuntu 18.04 . +2!:Since 2021.11, `ROBOTOLOGY_ENABLE_ROBOT_TESTING` does not support building with apt dependencies on Ubuntu 18.04 . + +3!:Since 2021.11, `ROBOTOLOGY_USES_PYTHON` does not support building with apt dependencies on Ubuntu 18.04 . + Profile-specific documentation =================================== From 113cb350162b0c2d00f0a64c6f42329c114b1042 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 5 Oct 2021 16:25:26 +0200 Subject: [PATCH 3/4] Fix gym-ignition to v1.2.2 in Stable branches until we migrate to Fortress --- cmake/ProjectsTagsStable.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/ProjectsTagsStable.cmake b/cmake/ProjectsTagsStable.cmake index 38528f273..81227a1d5 100644 --- a/cmake/ProjectsTagsStable.cmake +++ b/cmake/ProjectsTagsStable.cmake @@ -16,3 +16,4 @@ set_tag(casadi 3.5.5.3) set_tag(YCM_TAG ycm-0.13) set_tag(YARP_TAG yarp-3.5) set_tag(yarp-matlab-bindings_TAG yarp-3.5) +set_tag(gym-ignition_TAG v1.2.2) From b01d53ad0a93f5a92c102c07ed2fa945a8e7cbb3 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 5 Oct 2021 16:25:53 +0200 Subject: [PATCH 4/4] Fix gym-ignition to v1.2.2 in Unstable branches until we migrate to Fortress --- cmake/ProjectsTagsUnstable.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/ProjectsTagsUnstable.cmake b/cmake/ProjectsTagsUnstable.cmake index c89a9d198..ed07c733a 100644 --- a/cmake/ProjectsTagsUnstable.cmake +++ b/cmake/ProjectsTagsUnstable.cmake @@ -31,5 +31,5 @@ set_tag(icub-gazebo-wholebody_TAG devel) set_tag(whole-body-controllers_TAG master) set_tag(OsqpEigen_TAG master) set_tag(YARP_telemetry_TAG master) -set_tag(gym-ignition_TAG master) +set_tag(gym-ignition_TAG v1.2.2) set_tag(walking-teleoperation_TAG devel)