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

Install sdf/1.8 to versioned path #890

Merged
merged 1 commit into from
Mar 21, 2022

Conversation

scpeters
Copy link
Member

🦟 Bug fix

Fixes a mistake from merging forward in #808.

Summary

The SDF_MAJOR_VERSION variables were all replaced with PROJECT_VERSION_MAJOR in #780, but when merging forward in #808, this replacement was forgotten in the sdf/1.8 folder, which did not exist in the sdf10 branch. This causes conflicts between the sdfomat-X packages on Ubuntu.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • 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.

Fixes a mistake from merging forward in gazebosim#808.

Signed-off-by: Steve Peters <[email protected]>
@scpeters scpeters requested a review from j-rivero March 21, 2022 19:28
@scpeters scpeters requested a review from azeey as a code owner March 21, 2022 19:28
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Mar 21, 2022
@codecov-commenter
Copy link

Codecov Report

Merging #890 (2382182) into sdf11 (b0647c9) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##            sdf11     #890   +/-   ##
=======================================
  Coverage   88.91%   88.91%           
=======================================
  Files          73       73           
  Lines       11094    11094           
=======================================
  Hits         9864     9864           
  Misses       1230     1230           

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 b0647c9...2382182. Read the comment docs.

Copy link
Collaborator

@azeey azeey left a comment

Choose a reason for hiding this comment

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

Looks good. I wonder if we should alias SDF_MAJOR_VERSION to PROJECT_VERSION_MAJOR?

@scpeters
Copy link
Member Author

Looks good. I wonder if we should alias SDF_MAJOR_VERSION to PROJECT_VERSION_MAJOR?

we still have it in the C++ API, but I thought we had eliminated all instances of it. I was wrong of course, but I don't see any more instances of it now, having checked again on these future branches

@scpeters scpeters merged commit f9e3e3d into gazebosim:sdf11 Mar 21, 2022
@scpeters scpeters deleted the fix_sdf_1.8_install branch March 21, 2022 21:58
@scpeters scpeters mentioned this pull request Mar 21, 2022
7 tasks
@osrf-triage
Copy link

This pull request has been mentioned on Gazebo Community. There might be relevant details there:

https://community.gazebosim.org/t/new-ignition-releases-2022-03-25-fortress-edifice-citadel/1343/1

@osrf-triage
Copy link

This pull request has been mentioned on Gazebo Community. There might be relevant details there:

https://community.gazebosim.org/t/new-ignition-releases-2022-04-13-fortress-edifice/1367/1

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.

5 participants