Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add missed spec version 1.12 in the sdf_descriptions target (backport #1529) #1531

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 21, 2025

🦟 Bug fix

Fixes #

Summary

This also updates the default versions in root.sdf files

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • 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 and edit the commit message to match the pull request summary while retaining Signed-off-by messages.


This is an automatic backport of pull request #1529 done by [Mergify](https://mergify.com).

This also updates the default versions in root.sdf files

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
(cherry picked from commit fd0292a)

# Conflicts:
#	sdf/1.12/root.sdf
@mergify mergify bot requested review from azeey and scpeters as code owners January 21, 2025 16:05
@mergify mergify bot added the conflicts label Jan 21, 2025
Copy link
Contributor Author

mergify bot commented Jan 21, 2025

Cherry-pick of fd0292a has failed:

On branch mergify/bp/sdf14/pr-1529
Your branch is up to date with 'origin/sdf14'.

You are currently cherry-picking commit fd0292a4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   sdf/1.11/root.sdf
	modified:   sdf/CMakeLists.txt

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   sdf/1.12/root.sdf

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@scpeters
Copy link
Member

spec version 1.12 was added in sdf15

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
@azeey
Copy link
Collaborator

azeey commented Jan 21, 2025

Maybe it's better to create a new PR. The title for the backport doesn't really make sense on sdf14.

@azeey azeey closed this Jan 21, 2025
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants