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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicitly link to zlib in vendored copy of minizip #8049

Merged
merged 1 commit into from
May 1, 2024

Conversation

Osyotr
Copy link
Contributor

@Osyotr Osyotr commented Apr 30, 2024

No description provided.

Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
Copy link
Member

@vng vng left a comment

Choose a reason for hiding this comment

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

What does it suppose to fix if our platform compile Actions are fine?

@biodranik
Copy link
Member

@vng windows, we need to add an action for it too btw (maybe a manual one, until all build issues are fixed).

Copy link
Member

@biodranik biodranik left a comment

Choose a reason for hiding this comment

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

Thanks!

@biodranik biodranik merged commit 3042851 into organicmaps:master May 1, 2024
13 checks passed
@Osyotr Osyotr deleted the minizip-link branch May 1, 2024 10:39
@Osyotr
Copy link
Contributor Author

Osyotr commented May 1, 2024

What does it suppose to fix if our platform compile Actions are fine?

The only reason why it works is that zlib.h is in default include path in all platforms you test for.

we need to add an action for it too btw (maybe a manual one, until all build issues are fixed).

My WIP action: https://github.com/Osyotr/organicmaps/blob/wip-windows/.github/workflows/windows-check.yaml
Run results: https://github.com/Osyotr/organicmaps/actions/runs/8901513896/job/24445522531?pr=1
(Note that 30 min configure is because static qt is being built from source and resulting archive is >500mb in size so it can't be cached by vcpkg. Can probably cache the whole vcpkg_installed/ folder instead. Dynamic Qt does not have this problem.)

@biodranik
Copy link
Member

Cool, let's add this action with a manual run now into the master. Qt6 is available via both vcpkg and chocolatey, so it shouldn't be a problem, right?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants