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

Backwards compatible assimp texture name fix #565

Conversation

luca-della-vedova
Copy link
Member

@luca-della-vedova luca-della-vedova commented Dec 14, 2023

🦟 Bug fix

Supersedes #564

Summary

Apologies for the noise! Hopefully third time is the charm? When working on #564 and #563 I realized that we do have a way to ship changes that depend on the assimp version, by using a define.
This allows us to have the fix in Harmonic (LTS) without being blocked by the fact that gz-common4 is also shipped in Garden (that is short term support anyway).
If it's desirable I can open a PR targeting main that gets rid of all the ifdefs since they are only needed for compatibility with assimp 5.0.x that was last shipped in Ubuntu 20.04.

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.

Sorry, something went wrong.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Signed-off-by: Luca Della Vedova <[email protected]>
@github-actions github-actions bot added 🌱 garden Ignition Garden 🎵 harmonic Gazebo Harmonic labels Dec 14, 2023
Copy link

codecov bot commented Dec 14, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (983a1eb) 83.65% compared to head (c61d888) 83.65%.

Additional details and impacted files
@@             Coverage Diff             @@
##           gz-common5     #565   +/-   ##
===========================================
  Coverage       83.65%   83.65%           
===========================================
  Files              90       90           
  Lines           10272    10273    +1     
===========================================
+ Hits             8593     8594    +1     
  Misses           1679     1679           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Fix test
Signed-off-by: Luca Della Vedova <[email protected]>
@luca-della-vedova luca-della-vedova marked this pull request as ready for review December 14, 2023 02:48
@mjcarroll
Copy link
Contributor

macOS CI is unofficial and not needed here. The other two jenkins jobs are artifacts of the previous job names and are safe to ignore. (I'm removing them as required now).

@mjcarroll mjcarroll merged commit 680d797 into gazebosim:gz-common5 Dec 14, 2023
12 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden 🎵 harmonic Gazebo Harmonic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

3 participants