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

Cherry pick from sdf10 to master #317

Merged
merged 4 commits into from
Jul 21, 2020

Conversation

scpeters
Copy link
Member

Includes #269, #277, #264. Use rebase and merge for this.

traversaro and others added 4 commits July 17, 2020 10:20
)

For backward compatibility if it is not defined compile the tests

Signed-off-by: Silvio <silvio.traversaro@iit.it>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
* Remove vendored TinyXML
* Add FindTinyXML2 CMake Logic
* Add XmlUtils with test
* Update CI dependencies
* Allow trim to remove newlines as well
* Remove trailing quote in example sdf
* Make internal URDF parser use tinyxml2

Signed-off-by: Michael Carroll <michael@openrobotics.org>

Co-authored-by: Steve Peters <scpeters@openrobotics.org>
Co-authored-by: Addisu Z. Taddese <addisu@openrobotics.org>
@scpeters scpeters requested review from azeey and chapulina July 17, 2020 17:23
@codecov-commenter
Copy link

Codecov Report

Merging #317 into master will decrease coverage by 0.19%.
The diff coverage is 78.74%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #317      +/-   ##
==========================================
- Coverage   87.79%   87.60%   -0.20%     
==========================================
  Files          59       60       +1     
  Lines        9110     9147      +37     
==========================================
+ Hits         7998     8013      +15     
- Misses       1112     1134      +22     
Impacted Files Coverage Δ
src/SDFExtension.hh 100.00% <ø> (ø)
src/XmlUtils.cc 62.50% <62.50%> (ø)
src/parser_urdf.cc 79.43% <74.13%> (-0.78%) ⬇️
src/parser.cc 78.56% <83.82%> (-0.04%) ⬇️
src/Converter.cc 91.57% <92.94%> (+0.11%) ⬆️
src/Types.cc 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a460035...e54de35. Read the comment docs.

@scpeters
Copy link
Member Author

homebrew formula alias was still pointing to sdformat9, so I updated it to point to sdformat10 in osrf/homebrew-simulation@edd0b07

@scpeters
Copy link
Member Author

@osrf-jenkins run tests please

@scpeters scpeters merged commit 913a775 into gazebosim:master Jul 21, 2020
@scpeters scpeters deleted the cherry-pick-tinyxml2 branch July 21, 2020 00:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants