Skip to content
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

Merge 8 -> main #1006

Merged
merged 10 commits into from
May 30, 2024
Merged

Merge 8 -> main #1006

merged 10 commits into from
May 30, 2024

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented May 30, 2024

➡️ Forward port

Port gz-rendering8 to main

Branch comparison: main...gz-rendering8

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

azeey and others added 10 commits March 14, 2024 19:17
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
…t the externalWindowsHandle ogre-next option (#992)

Signed-off-by: Silvio Traversaro <[email protected]>
* Add pragma ignores for Woverloaded-virtual
* Ignore the warning on FindCUDA removal

---------

Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
@iche033 iche033 changed the base branch from gz-rendering8 to main May 30, 2024 06:33
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label May 30, 2024
@iche033 iche033 added 🏛️ ionic Gazebo Ionic and removed 🎵 harmonic Gazebo Harmonic labels May 30, 2024
@iche033
Copy link
Contributor Author

iche033 commented May 30, 2024

The INTEGRATION_load_unload_ogre_gl3plus test is failing on the new ubuntu noble jenkins build. Ticketed #1007 to keep track of this test failure.

@iche033 iche033 merged commit ec1225b into main May 30, 2024
7 of 10 checks passed
@iche033 iche033 deleted the merge_8_main_20240530 branch May 30, 2024 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏛️ ionic Gazebo Ionic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

6 participants