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

Fix ABI break on sdf11 #606

Merged
merged 2 commits into from
Jun 29, 2021
Merged

Conversation

azeey
Copy link
Collaborator

@azeey azeey commented Jun 28, 2021

🦟 Bug fix

Summary

Similar to #605, but with additional changes for the sdf11 branch. The recently added members to sdf::ElementPrivate are
explicitlySetInFile, lineNumber, and xmlPath (sdformat11_11.1.0...sdformat11_11.2.0)

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Code check passed (In source directory, run sh tools/code_check.sh)
  • All tests passed (See
    test coverage)
  • While waiting for a review on your PR, please help review
    another open pull request
    to support the maintainers

Note to maintainers: Remember to use Squash-Merge

Signed-off-by: Addisu Z. Taddese <[email protected]>
@azeey azeey self-assigned this Jun 28, 2021
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Jun 28, 2021
Copy link
Contributor

@adlarkin adlarkin left a comment

Choose a reason for hiding this comment

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

Just one minor comment, but otherwise, LGTM

include/sdf/Element.hh Outdated Show resolved Hide resolved
Signed-off-by: Addisu Z. Taddese <[email protected]>
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

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

For context, the ABI breaking change from #542 was released into 11.2.0. This reverts to the 11.1.0 ABI, and will be released into 11.2.1 soon.

@chapulina
Copy link
Contributor

@osrf-jenkins run tests, you're good to go now

@scpeters scpeters mentioned this pull request Jun 29, 2021
7 tasks
@chapulina
Copy link
Contributor

I enabled the DCO bot after this PR was open. Let's merge without that check for now, reopening the PR would trigger lots of builds.

@chapulina chapulina merged commit a4a71bc into gazebosim:sdf11 Jun 29, 2021
chapulina added a commit that referenced this pull request Jun 30, 2021
* Add triage, remove ticket templates (#608)

Signed-off-by: Louise Poubel <[email protected]>

* Fix ABI break on sdf11 (#606)

Signed-off-by: Addisu Z. Taddese <[email protected]>

* 🎈 11.2.1 (#609)

Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Steve Peters <[email protected]>

Co-authored-by: Steve Peters <[email protected]>

* Fix segfault when checking for required elements in joint (#610)

* Used xml instead of elemXml, added test for this particular case

Signed-off-by: Aaron Chong <[email protected]>

Co-authored-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
Co-authored-by: Aaron Chong <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏢 edifice Ignition Edifice
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants