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

chore(cpn): upgrade miniz to version 3.0.2 #4247

Merged
merged 3 commits into from
Oct 27, 2023
Merged

Conversation

elecpower
Copy link
Collaborator

@elecpower elecpower commented Oct 26, 2023

Fetch miniz v3.0.2 from its repo via cmake and remove our copy.
Remove double include of header.

@elecpower elecpower added the companion Related to the companion software label Oct 26, 2023
@raphaelcoeffic
Copy link
Member

@elecpower Maybe we should start avoiding to have library source code in our repo and use either submodules or CMake FetchContent as demonstrated in 54ed94e.

@elecpower
Copy link
Collaborator Author

@elecpower Maybe we should start avoiding to have library source code in our repo and use either submodules or CMake FetchContent as demonstrated in 54ed94e.

I was just following those who came before. Maybe there was a reason to copy the code when first hooked in. The Fetch maybe simpler than submodule on first glance

@raphaelcoeffic
Copy link
Member

The Fetch maybe simpler than submodule on first glance

With a little twist:

  • FetchContent will fetch the code only for native targets, so that firmware build won't download anything.
  • submodules are fetched during checkout phase, which would happen for firmware builds as well.

Now that we have Cloudbuild, I'm trying to reduce what is fetched on build for firmwares, so that I would love to prevent fetching code parts used by Companion when building firmwares. Fetching submodule on demand is a huge pain and has no native support in CMake.

@elecpower elecpower marked this pull request as draft October 26, 2023 19:45
@elecpower elecpower marked this pull request as ready for review October 26, 2023 20:00
@elecpower
Copy link
Collaborator Author

@raphaelcoeffic I've merged your branch

@pfeerick pfeerick added the house keeping 🧹 Cleanup of code and house keeping label Oct 27, 2023
@pfeerick pfeerick added this to the 2.10 milestone Oct 27, 2023
@pfeerick pfeerick merged commit 31fad8b into main Oct 27, 2023
40 checks passed
@pfeerick pfeerick deleted the elecpower/miniz-3.0.2 branch October 27, 2023 03:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
companion Related to the companion software house keeping 🧹 Cleanup of code and house keeping
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants