Skip to content

Commit

Permalink
Update ProjectsTagsStable.cmake in order to set yarp-3.10 as stable b…
Browse files Browse the repository at this point in the history
…ranch 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 <[email protected]>
Co-authored-by: Silvio Traversaro <[email protected]>
  • Loading branch information
3 people authored Nov 28, 2024
1 parent a8d1cb0 commit 133a557
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 15 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/pixi-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]
# 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
4 changes: 2 additions & 2 deletions cmake/ProjectsTagsStable.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
12 changes: 4 additions & 8 deletions cmake/RobotologySuperbuildOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
14 changes: 9 additions & 5 deletions releases/latest.releases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -266,15 +266,19 @@ 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
version: v0.0.2
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
Expand Down

0 comments on commit 133a557

Please sign in to comment.