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 #1316

Merged
merged 24 commits into from
Aug 30, 2023
Merged

Merge 13 -> 14 #1316

merged 24 commits into from
Aug 30, 2023

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Aug 30, 2023

➡️ Forward port

Port sdf13 to sdf14

Branch comparison: sdf14...sdf13

Also added pre1 version suffix

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

Marco A. Gutierrez and others added 24 commits May 29, 2023 03:52
Signed-off-by: Marco A. Gutierrez <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Update functions in parser.cc to use sdf::Errors output.
…nal and system headers (#1259)

Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label Aug 30, 2023
@codecov
Copy link

codecov bot commented Aug 30, 2023

Codecov Report

Merging #1316 (f7b355f) into sdf14 (017e1f6) will decrease coverage by 0.10%.
The diff coverage is 65.54%.

@@            Coverage Diff             @@
##            sdf14    #1316      +/-   ##
==========================================
- Coverage   87.56%   87.47%   -0.10%     
==========================================
  Files         134      134              
  Lines       17650    17751     +101     
==========================================
+ Hits        15456    15528      +72     
- Misses       2194     2223      +29     
Files Changed Coverage Δ
src/parser.cc 86.04% <64.95%> (-1.22%) ⬇️
src/Error.cc 100.00% <100.00%> (ø)
src/Root.cc 95.00% <100.00%> (ø)

@iche033 iche033 merged commit 1455c69 into sdf14 Aug 30, 2023
9 of 11 checks passed
@iche033 iche033 deleted the merge_13_14_20230830 branch August 30, 2023 22:02
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