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

Merge sdf9 ➡️ sdf12 #1107

Merged
merged 2 commits into from
Aug 11, 2022
Merged

Merge sdf9 ➡️ sdf12 #1107

merged 2 commits into from
Aug 11, 2022

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port sdf9 ➡️ sdf12

Branch comparision: sdf12...sdf9

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

Pro and others added 2 commits July 27, 2022 13:08
* fix: Use PACKAGE_PREFIX_DIR to ensure relocatable CMake install for conan

Signed-off-by: Stefan Profanter <[email protected]>

* Compute relative path for pkgconfig folder.
  This accounts for arch-dependent lib folders.

Signed-off-by: Steve Peters <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
Co-authored-by: Jose Luis Rivero <[email protected]>
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Aug 11, 2022
@scpeters
Copy link
Member Author

this has no actual changes; it just resolves the conflicts from the backport of #419 in #1093

@codecov
Copy link

codecov bot commented Aug 11, 2022

Codecov Report

Merging #1107 (8578309) into sdf12 (b59f6e1) will not change coverage.
The diff coverage is n/a.

❗ Current head 8578309 differs from pull request most recent head cfad1c6. Consider uploading reports for the commit cfad1c6 to get more accurate results

@@           Coverage Diff           @@
##            sdf12    #1107   +/-   ##
=======================================
  Coverage   91.28%   91.28%           
=======================================
  Files          80       80           
  Lines       13086    13086           
=======================================
  Hits        11946    11946           
  Misses       1140     1140           

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

@scpeters scpeters merged commit a84742c into sdf12 Aug 11, 2022
@scpeters scpeters deleted the scpeters/merge_9_12 branch August 11, 2022 18:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants