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 bullet cmake, probably bad merge #436

Merged
merged 1 commit into from
Oct 7, 2022

Conversation

nkoenig
Copy link
Contributor

@nkoenig nkoenig commented Oct 7, 2022

Signed-off-by: Nate Koenig [email protected]

🦟 Bug fix

Summary

gz-physics6 fails to compile on windows because creating symlinks requires additional privileges. It looks like the bullet cmake file might have had a bad merge because there are duplicate lines outside the if block. I've removed the lines in question.

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.

@github-actions github-actions bot added the 🌱 garden Ignition Garden label Oct 7, 2022
@codecov
Copy link

codecov bot commented Oct 7, 2022

Codecov Report

Merging #436 (35e47e9) into gz-physics6 (cdeb0a7) will not change coverage.
The diff coverage is n/a.

@@             Coverage Diff              @@
##           gz-physics6     #436   +/-   ##
============================================
  Coverage        73.69%   73.69%           
============================================
  Files              128      128           
  Lines             5787     5787           
============================================
  Hits              4265     4265           
  Misses            1522     1522           

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

Copy link
Member

@scpeters scpeters left a comment

Choose a reason for hiding this comment

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

it looks like our windows CI doesn't have bullet or dart installed, so I guess we've just never noticed in CI. thanks for the fix!

@scpeters scpeters merged commit 09b3e44 into gz-physics6 Oct 7, 2022
@scpeters scpeters deleted the fix_bullet_cmake_windows branch October 7, 2022 23:40
scpeters added a commit that referenced this pull request Oct 8, 2022
Backport #436.

Signed-off-by: Steve Peters <[email protected]>
@scpeters scpeters mentioned this pull request Oct 8, 2022
8 tasks
@scpeters
Copy link
Member

scpeters commented Oct 8, 2022

back porting to fortress in #437

ahcorde pushed a commit that referenced this pull request Oct 10, 2022
Backport #436.

Signed-off-by: Steve Peters <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants