Skip to content

Commit

Permalink
Merge branch 'master' into fix1348
Browse files Browse the repository at this point in the history
  • Loading branch information
traversaro authored Dec 2, 2024
2 parents 5c45cb3 + 2018c89 commit 183c4bd
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 28 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/pixi-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,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 ${{ matrix.pixi_task }}
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 @@ -116,14 +116,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
2 changes: 1 addition & 1 deletion conda/cmake/CondaGenerationOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
38 changes: 21 additions & 17 deletions releases/latest.releases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ 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
version: v3.9.0
version: v3.10.1
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
Expand All @@ -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 @@ -114,35 +114,35 @@ 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
version: v0.3.1
version: v0.3.2
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
version: v1.1.0
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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -222,15 +222,15 @@ 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
version: v1.16.8.1
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
Expand Down Expand Up @@ -266,20 +266,24 @@ 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
version: v0.0.3
QpSolversEigen:
type: git
url: https://github.com/ami-iit/qpsolvers-eigen.git
version: v0.0.1
version: v0.1.0

0 comments on commit 183c4bd

Please sign in to comment.