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

ign -> gz Migrate Ignition Headers : sdformat #1118

Merged
merged 10 commits into from
Nov 30, 2022
Merged

Conversation

methylDragon
Copy link
Contributor

@scpeters
Copy link
Member

needs release of gazebosim/gz-math#483

@scpeters
Copy link
Member

scpeters commented Sep 1, 2022

@osrf-jenkins run tests please

@codecov
Copy link

codecov bot commented Sep 1, 2022

Codecov Report

Merging #1118 (7120b45) into sdf9 (9a7c42a) will not change coverage.
The diff coverage is 87.66%.

@@           Coverage Diff           @@
##             sdf9    #1118   +/-   ##
=======================================
  Coverage   88.35%   88.35%           
=======================================
  Files          63       63           
  Lines       10093    10093           
=======================================
  Hits         8918     8918           
  Misses       1175     1175           
Impacted Files Coverage Δ
include/sdf/Param.hh 75.80% <ø> (ø)
include/sdf/SemanticPose.hh 100.00% <ø> (ø)
include/sdf/Types.hh 100.00% <ø> (ø)
src/Lidar.cc 89.63% <ø> (ø)
src/NavSat.cc 96.34% <ø> (ø)
src/Physics.cc 85.13% <ø> (ø)
src/Utils.hh 100.00% <ø> (ø)
src/Collision.cc 87.95% <50.00%> (ø)
src/Cylinder.cc 93.10% <50.00%> (ø)
src/Joint.cc 92.13% <50.00%> (ø)
... and 31 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@chapulina chapulina added the ign to gz Renaming Ignition to Gazebo. label Sep 2, 2022
@methylDragon methylDragon force-pushed the citadel_header_redirects branch from da294a2 to e883c1f Compare September 5, 2022 23:02
Signed-off-by: methylDragon <methylDragon@gmail.com>
@methylDragon methylDragon force-pushed the citadel_header_redirects branch from e883c1f to e40e5af Compare September 5, 2022 23:02
@scpeters
Copy link
Member

we also need to update the minimum version of ignition-math6 needed once we start using gz/* and gz::

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

scpeters commented Oct 5, 2022

we also need to update the minimum version of ignition-math6 needed once we start using gz/* and gz::

added in 9624a0c

@@ -3484,7 +3484,7 @@ void ReduceSDFExtensionPluginFrameReplace(
// create new offset xml blocks
xyzKey = new TiXmlElement("xyzOffset");
rpyKey = new TiXmlElement("rpyOffset");
correctedOffsetKey = new TiXmlElement("ignition::corrected_offsets");
correctedOffsetKey = new TiXmlElement("gz::corrected_offsets");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these changes to the element name should be reverted

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// remove xyzOffset and rpyOffset
(*_blobIt)->RemoveChild(rpyKey);
}
TiXmlNode* correctedOffsetKey =
(*_blobIt)->FirstChild("ignition::corrected_offsets");
(*_blobIt)->FirstChild("gz::corrected_offsets");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these changes to the element name should be reverted

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nate Koenig and others added 4 commits October 5, 2022 21:44
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
@nkoenig nkoenig requested a review from scpeters November 21, 2022 18:33
@nkoenig
Copy link
Contributor

nkoenig commented Nov 29, 2022

@scpeters, is this safe to merge?

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

@scpeters, is this safe to merge?

just made a last few changes I hadn't yet committed. We can merge when CI is clean

@scpeters scpeters merged commit 686476b into sdf9 Nov 30, 2022
@scpeters scpeters deleted the citadel_header_redirects branch November 30, 2022 03:47
This was referenced Nov 30, 2022
scpeters added a commit to gazebo-release/sdformat9-release that referenced this pull request Nov 30, 2022
Required by gazebosim/sdformat#1118.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏰 citadel Ignition Citadel Gazebo 1️1️ Dependency of Gazebo classic version 11 ign to gz Renaming Ignition to Gazebo.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants