Skip to content

Merge 9 -> main#542

Merged
iche033 merged 18 commits intomainfrom
merge_9_main_20250728
Jul 28, 2025
Merged

Merge 9 -> main#542
iche033 merged 18 commits intomainfrom
merge_9_main_20250728

Conversation

@iche033
Copy link
Copy Markdown
Contributor

@iche033 iche033 commented Jul 28, 2025

➡️ Forward port

Port gz-sensors9 to main

Branch comparison: gz-sensors9...main

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

scpeters and others added 17 commits August 25, 2024 19:34
Include gz/msgs/PointCloudPackedUtils.hh for
gz::msgs::InitPointCloudPacked.

DepthCameraSensor and GpuLidarSensor also use
InitPointCloudPacked so include the header there too.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
(cherry picked from commit aaef365)

Co-authored-by: Ian Chen <ichen@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Part of gazebo-tooling/release-tools#1288

Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com>
Signed-off-by: Fabrice Larribe <693401+teyssieuman@users.noreply.github.com>
(cherry picked from commit d266990)
Signed-off-by: Marcel Jacobse <44684927+mjacobse@users.noreply.github.com>
Adds bazel build support for gz-sensors. The bzlmod setup is similar to sdformat (added in gazebosim/sdformat#1493).

Also adds bazel CI.

Some include paths in test/test_config.hh and src/DopplerVelocityLog.cc had to be adjusted to satisfy layering check.

Signed-off-by: Shameek Ganguly <shameek@intrinsic.ai>
* Bump to version 9.2.0

Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com>

* Bump package.xml

Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com>

---------

Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com>
Signed-off-by: Maksim Derbasov <ntfs.hard@gmail.com>
Signed-off-by: Maksim Derbasov <ntfs.hard@gmail.com>
(cherry picked from commit 76532a6)
Signed-off-by: Ian Chen <ichen@openrobotics.org>

# Conflicts:
#	src/LogicalCameraSensor.cc
Signed-off-by: Ian Chen <ichen@openrobotics.org>
Signed-off-by: momo <2438833481@qq.com>
Signed-off-by: Oscmoar07 <108773152+XINJIANGMO@users.noreply.github.com>
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
…538)

(cherry picked from commit d045b32)

Signed-off-by: momo <2438833481@qq.com>
Signed-off-by: Oscmoar07 <108773152+XINJIANGMO@users.noreply.github.com>
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Co-authored-by: Oscmoar07 <108773152+XINJIANGMO@users.noreply.github.com>
Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Signed-off-by: Shameek Ganguly <shameek@intrinsic.ai>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
@github-project-automation github-project-automation bot moved this from Inbox to In review in Core development Jul 28, 2025
@azeey azeey added this to the Jetty Release milestone Jul 28, 2025
MODULE.bazel Outdated
Comment on lines +25 to +26
strip_prefix = "gz-common-gz-common6",
urls = ["https://github.com/gazebosim/gz-common/archive/refs/heads/gz-common6.tar.gz"],
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when forward-porting to main, I have had to make these changes manually to every MODULE.bazel file for each gz dependency

Suggested change
strip_prefix = "gz-common-gz-common6",
urls = ["https://github.com/gazebosim/gz-common/archive/refs/heads/gz-common6.tar.gz"],
strip_prefix = "gz-common-main",
urls = ["https://github.com/gazebosim/gz-common/archive/refs/heads/main.tar.gz"],

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually I'm confused how bazel CI passed without these changes

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it passes because the API hasn't changed between it still compiles against the Ionic version of dependencies. I originally noticed the failure when removing version numbers from package names (like in gazebosim/gz-math#677) since the script would convert the tarball name gz-utils3.tar.gz (based on a branch name) to gz-utils.tar.gz, which fails because there is no gz-utils branch. So I think we should still do this, but now I understand why CI could pass

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes we should make these changes. I updated all the deps to be from main branches.

@iche033 iche033 force-pushed the merge_9_main_20250728 branch from 382d5d7 to 04dc490 Compare July 28, 2025 21:58
Signed-off-by: Ian Chen <ichen@openrobotics.org>
@iche033 iche033 force-pushed the merge_9_main_20250728 branch from 04dc490 to 24f5370 Compare July 28, 2025 22:00
@iche033 iche033 merged commit 21a2b1f into main Jul 28, 2025
12 checks passed
@iche033 iche033 deleted the merge_9_main_20250728 branch July 28, 2025 22:43
@github-project-automation github-project-automation bot moved this from In review to Done in Core development Jul 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🪵 jetty Gazebo Jetty

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

10 participants