Merge 14 -> main #1391
Merged
Merge 14 -> main #1391
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Addisu Z. Taddese <[email protected]>
This fixes an error when building https://github.com/gazebo-release/sdformat_vendor/ in the ROS buildfarm where `CMAKE_STAGING_PREFIX` is used Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1391 +/- ##
=======================================
Coverage 92.45% 92.45%
=======================================
Files 134 134
Lines 17820 17820
=======================================
Hits 16475 16475
Misses 1345 1345 ☔ View full report in Codecov by Sentry. |
azeey
requested changes
Apr 4, 2024
There was a problem hiding this comment.
Can you make the same changes in the sdf/1.12 directory?
Signed-off-by: Ian Chen <[email protected]>
iche033
force-pushed
the
merge_14_main_20240404
branch
from
4f77316 to
1860956
Compare
scpeters
approved these changes
Apr 4, 2024
azeey
approved these changes
Apr 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
➡️ Forward port
Port sdf14 to main
Branch comparison: main...sdf14
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)