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 sdf14 ➡️ main #1420

Merged
merged 8 commits into from
May 21, 2024
Merged

Merge sdf14 ➡️ main #1420

merged 8 commits into from
May 21, 2024

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port sdf14 ➡️ main

Branch comparison: main...sdf14

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

iche033 and others added 8 commits April 10, 2024 16:45
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
The `gz sdf` tests are fixed by 
* fixing dll path issue with Ruby on windows
* Setting home path

---------

Signed-off-by: Addisu Z. Taddese <[email protected]>
* Fix trivial warning on 24.04 for JointAxis_TEST.cc

---------

Signed-off-by: Jose Luis Rivero <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
* Enable 24.04 CI, remove distutils dependency (#1408)
  distutils is no longer required since this branch requires a
 new enough version of cmake.

Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Jorge Perez <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
@scpeters scpeters merged commit 213814c into main May 21, 2024
12 checks passed
@scpeters scpeters deleted the scpeters/merge_14_main branch May 21, 2024 00:14
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