Skip to content

Bumps in garden: use ign-math7#803

Merged
scpeters merged 10 commits intomainfrom
ci_matching_branch/bump_garden_sdformat13
Dec 29, 2021
Merged

Bumps in garden: use ign-math7#803
scpeters merged 10 commits intomainfrom
ci_matching_branch/bump_garden_sdformat13

Conversation

@chapulina
Copy link
Copy Markdown
Contributor

@chapulina chapulina commented Dec 27, 2021

Signed-off-by: Louise Poubel <louise@openrobotics.org>
@scpeters scpeters changed the title Bumps in garden : ci_matching_branch/bump_garden_sdformat13 Bumps in garden: sdformat13 Dec 27, 2021
@scpeters
Copy link
Copy Markdown
Member

looks like a compilation error with ign-math7

Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Copy link
Copy Markdown
Contributor Author

looks like a compilation error with ign-math7

It builds for me locally with gazebosim/gz-math#342, but the CI error seemed different. Let's see this new round.

@scpeters
Copy link
Copy Markdown
Member

there are test failures related to -0 in quaternion streams

@scpeters
Copy link
Copy Markdown
Member

there are test failures related to -0 in quaternion streams

I believe this is a behavior change with ign-math7 from gazebosim/gz-math#206

@chapulina
Copy link
Copy Markdown
Contributor Author

chapulina commented Dec 27, 2021

It builds for me locally with gazebosim/gz-math#342, but the CI error seemed different. Let's see this new round.

Humm it still fails on Ubuntu CI, with both Bionic and Focal

2021-12-27T19:15:10.4098630Z In file included from /github/workspace/src/Ellipsoid.cc:18:
2021-12-27T19:15:10.4099822Z /github/workspace/include/sdf/Ellipsoid.hh:20:10: fatal error: ignition/math/Ellipsoid.hh: No such file or directory
2021-12-27T19:15:10.4100715Z  #include <ignition/math/Ellipsoid.hh>
2021-12-27T19:15:10.4101593Z           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~

@scpeters
Copy link
Copy Markdown
Member

It builds for me locally with ignitionrobotics/ign-math#342, but the CI error seemed different. Let's see this new round.

Humm it still fails on Ubuntu CI, with both Bionic and Focal

2021-12-27T19:15:10.4098630Z In file included from /github/workspace/src/Ellipsoid.cc:18:
2021-12-27T19:15:10.4099822Z /github/workspace/include/sdf/Ellipsoid.hh:20:10: fatal error: ignition/math/Ellipsoid.hh: No such file or directory
2021-12-27T19:15:10.4100715Z  #include <ignition/math/Ellipsoid.hh>
2021-12-27T19:15:10.4101593Z           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~

I think that build started before the nightlies were rebuilt

Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina chapulina changed the base branch from main to chapulina/12_to_13 December 27, 2021 20:21
@chapulina
Copy link
Copy Markdown
Contributor Author

This PR now builds on top of #805

…_sdformat13

Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Copy link
Copy Markdown
Contributor Author

Now we need gazebosim/gz-math#235 merged forward, CC @scpeters

/home/chapulina/dev_focal/ws_garden/src/sdformat/src/World.cc: In member function _sdf::v13::ElementPtr sdf::v13::World::ToElement() const_:
/home/chapulina/dev_focal/ws_garden/src/sdformat/src/World.cc:836:55: error: cannot convert _ignition::math::v7::SphericalCoordinates::Surfa
ceType_ to _const string&_ {aka _const std::__cxx11::basic_string<char>&_}
  836 |           this->dataPtr->sphericalCoordinates->Surface()));
      |           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~
      |                                                       |
      |                                                       ignition::math::v7::SphericalCoordinates::SurfaceType

Base automatically changed from chapulina/12_to_13 to main December 27, 2021 21:36
@scpeters
Copy link
Copy Markdown
Member

Now we need ignitionrobotics/ign-math#235 merged forward, CC @scpeters

/home/chapulina/dev_focal/ws_garden/src/sdformat/src/World.cc: In member function _sdf::v13::ElementPtr sdf::v13::World::ToElement() const_:
/home/chapulina/dev_focal/ws_garden/src/sdformat/src/World.cc:836:55: error: cannot convert _ignition::math::v7::SphericalCoordinates::Surfa
ceType_ to _const string&_ {aka _const std::__cxx11::basic_string<char>&_}
  836 |           this->dataPtr->sphericalCoordinates->Surface()));
      |           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~
      |                                                       |
      |                                                       ignition::math::v7::SphericalCoordinates::SurfaceType

gazebosim/gz-math#344

Caused by gazebosim/gz-math#206

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Dec 29, 2021

Codecov Report

Merging #803 (71d8181) into main (4a7d129) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #803      +/-   ##
==========================================
- Coverage   90.70%   90.69%   -0.01%     
==========================================
  Files          78       78              
  Lines       12439    12440       +1     
==========================================
  Hits        11283    11283              
- Misses       1156     1157       +1     
Impacted Files Coverage Δ
src/Light.cc 92.30% <100.00%> (ø)
include/sdf/InterfaceElements.hh 50.00% <0.00%> (-16.67%) ⬇️

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 4a7d129...71d8181. Read the comment docs.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters changed the title Bumps in garden: sdformat13 Bumps in garden: use ign-math7 Dec 29, 2021
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters merged commit 1495b3f into main Dec 29, 2021
@scpeters scpeters deleted the ci_matching_branch/bump_garden_sdformat13 branch December 29, 2021 05: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.

5 participants