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

[HiGHS] add explicit Zlib_jll dependency #8071

Merged
merged 6 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions H/HiGHS/HiGHS/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ platforms = expand_cxxstring_abis(platforms)

dependencies = [
Dependency("CompilerSupportLibraries_jll"),
Dependency("Zlib_jll"),
]

build_tarballs(
Expand Down
1 change: 1 addition & 0 deletions H/HiGHS/HiGHSstatic/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ dependencies = [
# is a build-only dependency, in the other cases it's also a runtime one.
Dependency("CompilerSupportLibraries_jll"; platforms=filter(!Sys.iswindows, platforms)),
BuildDependency("CompilerSupportLibraries_jll"; platforms=filter(Sys.iswindows, platforms)),
Dependency("Zlib_jll"),
]

build_tarballs(
Expand Down
2 changes: 1 addition & 1 deletion H/HiGHS/highs_common.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ using BinaryBuilder, Pkg

name = "HiGHS"

version = v"1.6.0"
version = v"1.6.1"
Copy link
Member

Choose a reason for hiding this comment

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

The upstream version didn't change though?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah upstream hasn't released a new version yet. But I also thought that you couldn't add new dependencies to a +1 version?

Copy link
Member

Choose a reason for hiding this comment

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

Adding is actually fine, it's removing, or changing compat bounds, that doesn't work

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah okay cool. I reverted to 1.6.0

odow marked this conversation as resolved.
Show resolved Hide resolved

sources = [
GitSource(
Expand Down