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 13 -> 14 #1428

Merged
merged 9 commits into from
May 31, 2024
Merged

Merge 13 -> 14 #1428

merged 9 commits into from
May 31, 2024

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented May 31, 2024

➡️ Forward port

Port sdf13 to sdf14

Branch comparison: sdf14...sdf13

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

iche033 and others added 9 commits March 20, 2024 09:58
Partially backports #1374 to fix #1321
* Add package.xml, fix `gz sdf` tests on Windows (#1374)
  The `gz sdf` tests are fixed by
    * fixing dll path issue with Ruby on windows
    * Setting home path
* Fix macOS workflow

Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label May 31, 2024
@iche033 iche033 merged commit 87feee0 into sdf14 May 31, 2024
12 checks passed
@iche033 iche033 deleted the merge_13_14_20240531 branch May 31, 2024 10:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎵 harmonic Gazebo Harmonic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants