Skip to content

Merge gz-plugin3 ➡️ main #173

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.

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
merged 16 commits into from
Apr 28, 2025
Merged

Merge gz-plugin3 ➡️ main #173

merged 16 commits into from
Apr 28, 2025

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port gz-plugin3 ➡️ main

Branch comparison: main...gz-plugin3

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

caguero and others added 16 commits August 27, 2024 19:53
* Update gz-plugin3 badge URLs

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
Signed-off-by: Van Malleghem Antoine <antoine.vanmalleghem@botronics.be>
Signed-off-by: Van Malleghem Antoine <antoine.vanmalleghem@botronics.be>
(cherry picked from commit d983b93)

Co-authored-by: Antoine Van Malleghem <a.vanmalleghem@gmail.com>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
A more recent version of cmake is already required for
other Harmonic dependencies, such as gz-cmake3, so
increase the required version here to fix a warning.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Merge gz-plugin2 ➡️  gz-plugin3
Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Part of gazebo-tooling/release-tools#1288

Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com>
Signed-off-by: root <leo.daniel.lin@gmail.com>
(cherry picked from commit 5302cb3)

Co-authored-by: LeoLin6 <61672672+LeoLin6@users.noreply.github.com>
Part of gazebo-tooling/release-tools#1222.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@github-project-automation github-project-automation bot moved this from Inbox to In review in Core development Apr 28, 2025
@ahcorde ahcorde enabled auto-merge April 28, 2025 20:15
@ahcorde
Copy link
Contributor

ahcorde commented Apr 28, 2025

@scpeters I can't merge it, gz_plugin-pr-win is hanging.

@ahcorde ahcorde merged commit 4c14ed2 into main Apr 28, 2025
10 checks passed
@ahcorde ahcorde deleted the scpeters/merge_3_main branch April 28, 2025 20:26
@github-project-automation github-project-automation bot moved this from In review to Done in Core development Apr 28, 2025
@iche033
Copy link
Contributor

iche033 commented Apr 28, 2025

@scpeters I can't merge it, gz_plugin-pr-win is hanging.

updated branch protection rules, removed gz_plugin-pr-win and added gz_plugin-pr-cnlwin

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

7 participants