Skip to content

lyrical: pin the Jetty majors of the gz vendors that drifted to Ionic on osx-arm64 #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
traversaro merged 2 commits into from
Nov 9, 2026
Merged

lyrical: pin the Jetty majors of the gz vendors that drifted to Ionic on osx-arm64 #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1167390
lyrical: pin the Jetty majors of the gz vendors that drifted to Ionic
Tobias-Fischer Nov 9, 2026
02bdf36
rs build-one: create the recipe's patch/ directory before copying pat…
Tobias-Fischer Nov 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions distros/lyrical/patch/dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ gz_fuel_tools_vendor:
add_host: ["gz-fuel-tools"]
add_run: ["gz-fuel-tools"]
gz_gui_vendor:
add_host: ["gz-gui"]
add_run: ["gz-gui"]
add_host: ["gz-gui 10.*"]
add_run: ["gz-gui 10.*"]
gz_launch_vendor:
add_host: ["gz-launch"]
add_run: ["gz-launch"]
Expand Down Expand Up @@ -76,17 +76,19 @@ gz_ros2_control:
gz_ros2_control_demos:
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]
gz_sensors_vendor:
add_host: ["gz-sensors"]
add_run: ["gz-sensors"]
add_host: ["gz-sensors 10.*"]
add_run: ["gz-sensors 10.*"]
gz_sim_vendor:
add_host: ["libgz-sim"]
add_run: ["libgz-sim"]
add_host: ["libgz-sim 10.*"]
add_run: ["libgz-sim 10.*"]
gz_tools_vendor:
add_host: ["gz-tools"]
add_run: ["gz-tools"]
gz_transport_vendor:
add_host: ["libgz-transport"]
add_run: ["libgz-transport"]
# the vendor needs Jetty's major version: unpinned, an osx-arm64 py312 solve took
# gz-transport 14 (Ionic), whose builds go with a newer libabseil than Jetty's
add_host: ["libgz-transport 15.*"]
add_run: ["libgz-transport 15.*"]
gz_utils_vendor:
add_host: ["gz-utils"]
add_run: ["gz-utils"]
Expand Down
8 changes: 8 additions & 0 deletions distros/lyrical/pkg_additional_info.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,14 @@ fuse_viz:
build_number: 31
grid_map_rviz_plugin:
build_number: 31
gz_gui_vendor:
build_number: 33
gz_sensors_vendor:
build_number: 33
gz_sim_vendor:
build_number: 33
gz_transport_vendor:
build_number: 33
moveit_ros_visualization:
build_number: 31
moveit_task_constructor_visualization:
Expand Down
2 changes: 2 additions & 0 deletions tools/robostack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,8 @@ def task(distro: str, name: str, args: list[str]) -> int:
if name == "build-one":
pkg = args[0] if args else "ros2-ros-workspace"
for patch in (d / "patch").glob(f"{pkg}.*patch"):
# a recipe without a patch for this platform has no patch/ directory
(w / "recipes" / pkg / "patch").mkdir(exist_ok=True)
shutil.copy(patch, w / "recipes" / pkg / "patch" / patch.name)
return run(rattler_build(distro, ["--recipe", f"./recipes/{pkg}/recipe.yaml", *args[1:]], False), w)
if name == "gha": # staged build workflows for one platform, see .github/workflows/main.yaml
Expand Down
Loading