From 133a55783d9d087c6a6d3c337daa77ccb945c988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Genesio=20=28=E4=BA=8C=E3=82=B3=E3=82=B2?= =?UTF-8?q?=E3=83=8D=29?= Date: Thu, 28 Nov 2024 10:06:45 +0100 Subject: [PATCH 1/3] Update ProjectsTagsStable.cmake in order to set yarp-3.10 as stable branch and use YARP 3.10 releases in LatestReleases (#1747) * Update ProjectsTagsStable.cmake in order to set yarp-3.10 as stable branch --------- Co-authored-by: Silvio Traversaro Co-authored-by: Silvio Traversaro --- .github/workflows/pixi-ci.yml | 4 ++++ cmake/ProjectsTagsStable.cmake | 4 ++-- cmake/RobotologySuperbuildOptions.cmake | 12 ++++-------- releases/latest.releases.yaml | 14 +++++++++----- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/workflows/pixi-ci.yml b/.github/workflows/pixi-ci.yml index be896b5f9..9b75df98b 100644 --- a/.github/workflows/pixi-ci.yml +++ b/.github/workflows/pixi-ci.yml @@ -48,4 +48,8 @@ jobs: # Eventually we could consider removing that check in YCM git config --global user.name PixiGHA User git config --global user.email pixighauser@example.com + # On Windows the setup.bat generated by the pixi run configure + # needs to be called before calling pixi run build-all, so + # we explicitly call pixi run configure-all + pixi run configure-all pixi run build-all diff --git a/cmake/ProjectsTagsStable.cmake b/cmake/ProjectsTagsStable.cmake index c84a24240..cc9e470c8 100644 --- a/cmake/ProjectsTagsStable.cmake +++ b/cmake/ProjectsTagsStable.cmake @@ -16,6 +16,6 @@ set_tag(casadi-matlab-bindings_TAG v3.6.7.0) # Robotology projects set_tag(YCM_TAG master) -set_tag(YARP_TAG yarp-3.9) -set_tag(yarp-matlab-bindings_TAG yarp-3.9) +set_tag(YARP_TAG yarp-3.10) +set_tag(yarp-matlab-bindings_TAG yarp-3.10) set_tag(gym-ignition_TAG v1.3.1) diff --git a/cmake/RobotologySuperbuildOptions.cmake b/cmake/RobotologySuperbuildOptions.cmake index df090ab2d..0e5f320d6 100644 --- a/cmake/RobotologySuperbuildOptions.cmake +++ b/cmake/RobotologySuperbuildOptions.cmake @@ -114,14 +114,10 @@ set(ROBOTOLOGY_PROJECT_TAGS_CUSTOM_FILE CACHE FILEPATH "If ROBOTOLOGY_PROJECT_TA set_property(CACHE ROBOTOLOGY_PROJECT_TAGS PROPERTY STRINGS "Stable" "Unstable" "LatestRelease" "Custom") -# For now, only YARP master (used in Unstable ROBOTOLOGY_PROJECT_TAGS) requires to have separate yarp-ros and yarp-ros-devices -# However, we keep ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS as a user selectable option as some users could use ROBOTOLOGY_PROJECT_TAGS set to -# Stable or a given release, and manually change the YARP to a version that does not contain yarp-ros functionality -option(ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS "If ON, build yarp-ros and yarp-ros-devices repository" OFF) -if(ROBOTOLOGY_PROJECT_TAGS STREQUAL "Unstable") - # If ROBOTOLOGY_PROJECT_TAGS is Unstable, force the value to be ON - set(ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS ON CACHE BOOL "" FORCE) -endif() +# Since YARP 3.10 this requires to have separate yarp-ros and yarp-ros-devices +# However, we keep ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS as a user selectable option to easily revert to the old behaviour +option(ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS "If ON, build yarp-ros and yarp-ros-devices repository" ON) +mark_as_advanced(ROBOTOLOGY_BUILD_SEPARATE_YARP_ROS) if(ROBOTOLOGY_PROJECT_TAGS STREQUAL "Stable") include(ProjectsTagsStable) diff --git a/releases/latest.releases.yaml b/releases/latest.releases.yaml index c2f798ab8..b3dc93934 100644 --- a/releases/latest.releases.yaml +++ b/releases/latest.releases.yaml @@ -30,7 +30,7 @@ repositories: YARP: type: git url: https://github.com/robotology/yarp.git - version: v3.9.0 + version: v3.10.1 ICUB: type: git url: https://github.com/robotology/icub-main.git @@ -58,7 +58,7 @@ repositories: yarp-matlab-bindings: type: git url: https://github.com/robotology/yarp-matlab-bindings.git - version: v3.9.1 + version: v3.10.0 RobotTestingFramework: type: git url: https://github.com/robotology/robot-testing-framework.git @@ -118,7 +118,7 @@ repositories: yarp-devices-forcetorque: type: git url: https://github.com/robotology/yarp-devices-forcetorque.git - version: v0.3.1 + version: v0.3.2 HumanDynamicsEstimation: type: git url: https://github.com/robotology/human-dynamics-estimation.git @@ -266,7 +266,11 @@ repositories: yarp-devices-ros: type: git url: https://github.com/robotology/yarp-devices-ros.git - version: v3.9.1 + version: v3.10.0 + yarp-ros: + type: git + url: https://github.com/robotology/yarp-ros.git + version: v3.10.0 yarp-device-keyboard-joypad: type: git url: https://github.com/ami-iit/yarp-device-keyboard-joypad.git @@ -274,7 +278,7 @@ repositories: gz-sim-yarp-plugins: type: git url: https://github.com/robotology/gz-sim-yarp-plugins.git - version: v0.3.0 + version: v0.3.1 sharedlibpp: type: git url: https://github.com/ami-iit/sharedlibpp.git From a0d76311f2af50d2275757c708a685613af51088 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 2 Dec 2024 09:55:53 +0100 Subject: [PATCH 2/3] Bump CONDA_BUILD_NUMBER to 148 --- conda/cmake/CondaGenerationOptions.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/cmake/CondaGenerationOptions.cmake b/conda/cmake/CondaGenerationOptions.cmake index 494a12617..e4f463d88 100644 --- a/conda/cmake/CondaGenerationOptions.cmake +++ b/conda/cmake/CondaGenerationOptions.cmake @@ -2,7 +2,7 @@ # to ensure that binaries belonging to different rebuilds # can be distinguished even if the version number is the same if(NOT CONDA_BUILD_NUMBER) - set(CONDA_BUILD_NUMBER 147) + set(CONDA_BUILD_NUMBER 148) endif() # This option is enabled only when the metapackages robotology-distro and robotology-distro-all are From 2018c89c71a5ca750076382396cbadcf3eba8b49 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 15:37:53 +0100 Subject: [PATCH 3/3] Automatic update of latest releases versions (#1748) Co-authored-by: traversaro <1857049+traversaro@users.noreply.github.com> --- releases/latest.releases.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/releases/latest.releases.yaml b/releases/latest.releases.yaml index b3dc93934..30ce37839 100644 --- a/releases/latest.releases.yaml +++ b/releases/latest.releases.yaml @@ -26,7 +26,7 @@ repositories: YCM: type: git url: https://github.com/robotology/ycm.git - version: v0.17.1 + version: v0.18.0 YARP: type: git url: https://github.com/robotology/yarp.git @@ -34,7 +34,7 @@ repositories: ICUB: type: git url: https://github.com/robotology/icub-main.git - version: v2.6.3 + version: v2.7.1 ICUBcontrib: type: git url: https://github.com/robotology/icub-contrib-common.git @@ -114,7 +114,7 @@ repositories: walking-teleoperation: type: git url: https://github.com/robotology/walking-teleoperation.git - version: v1.3.4 + version: v1.3.5 yarp-devices-forcetorque: type: git url: https://github.com/robotology/yarp-devices-forcetorque.git @@ -122,7 +122,7 @@ repositories: HumanDynamicsEstimation: type: git url: https://github.com/robotology/human-dynamics-estimation.git - version: v4.0.3 + version: v4.1.0 human-gazebo: type: git url: https://github.com/robotology/human-gazebo.git @@ -130,19 +130,19 @@ repositories: icub_firmware_shared: type: git url: https://github.com/robotology/icub-firmware-shared.git - version: v1.40.0 + version: v1.41.0 icub-firmware: type: git url: https://github.com/robotology/icub-firmware.git - version: v1.40.0 + version: v1.41.0 icub-firmware-build: type: git url: https://github.com/robotology/icub-firmware-build.git - version: v1.40.0 + version: v1.41.0 icub-firmware-models: type: git url: https://github.com/robotology/icub-firmware-models.git - version: v1.39.0 + version: v1.41.0 yarp-device-xsensmt: type: git url: https://github.com/robotology/yarp-device-xsensmt.git @@ -178,7 +178,7 @@ repositories: matioCpp: type: git url: https://github.com/ami-iit/matio-cpp.git - version: v0.2.5 + version: v0.2.6 osqp-matlab: type: git url: https://github.com/ami-iit/osqp-matlab-cmake-buildsystem.git @@ -222,7 +222,7 @@ repositories: OpenXR: type: git url: https://github.com/KhronosGroup/OpenXR-SDK.git - version: release-1.1.42 + version: release-1.1.43 OpenVR: type: git url: https://github.com/ami-iit/openvr.git @@ -230,7 +230,7 @@ repositories: yarp-device-openxrheadset: type: git url: https://github.com/ami-iit/yarp-device-openxrheadset.git - version: v0.0.4 + version: v0.0.5 yarp-openvr-trackers: type: git url: https://github.com/ami-iit/yarp-openvr-trackers.git @@ -286,4 +286,4 @@ repositories: QpSolversEigen: type: git url: https://github.com/ami-iit/qpsolvers-eigen.git - version: v0.0.1 + version: v0.1.0