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

[LibGit2_jll] Update to v1.6.1 #48789

Merged
merged 4 commits into from
Feb 26, 2023
Merged

[LibGit2_jll] Update to v1.6.1 #48789

merged 4 commits into from
Feb 26, 2023

Conversation

fxcoudert
Copy link
Contributor

@fxcoudert fxcoudert commented Feb 25, 2023

Depends on JuliaPackaging/Yggdrasil#6297

Could someone remind me of the magic command to regenerate deps/checksums/libgit2?
got it: make -f contrib/refresh_checksums.mk libgit2

@giordano giordano added domain:building Build system, or building Julia or its dependencies libgit2 The libgit2 library or the LibGit2 stdlib module external dependencies Involves LLVM, OpenBLAS, or other linked libraries stdlib:JLLs labels Feb 25, 2023
@fxcoudert
Copy link
Contributor Author

Updated and pushed

Comment on lines -24 to +26
const libgit2 = "@rpath/libgit2.1.5.dylib"
const libgit2 = "@rpath/libgit2.1.6.dylib"
else
const libgit2 = "libgit2.so.1.5"
const libgit2 = "libgit2.so.1.6"
Copy link
Contributor

Choose a reason for hiding this comment

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

Sounds like libgit2 v1.6 has still soversion 1.5. Not sure that was done on purpose though, although it'd be great if they didn't break the ABI again.

Copy link
Contributor

@giordano giordano Feb 25, 2023

Choose a reason for hiding this comment

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

Might have not been done on purpose, given the fact now there's v1.6.1 which includes this: libgit2/libgit2@8a871d1

Copy link
Contributor

Choose a reason for hiding this comment

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

And v1.6.0 was retracted

Copy link
Sponsor Member

Choose a reason for hiding this comment

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

It looks like the build product is still called libgit2.so.1.5
https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/tag/LibGit2-v1.6.0%2B0

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, they tagged 1.6.0 before merging libgit2/libgit2#6501, the soversion was not bumped in v1.6.0. This has been rectified in v1.6.1.

@fxcoudert
Copy link
Contributor Author

New Yggdrasil PR for 1.6.1: JuliaPackaging/Yggdrasil#6313

@giordano
Copy link
Contributor

The rebase didn't go well, this PR now includes unrelated commits

@fxcoudert
Copy link
Contributor Author

Should be fixed now

@giordano giordano changed the title [LibGit2_jll] Update to v1.6.0 [LibGit2_jll] Update to v1.6.1 Feb 26, 2023
@fxcoudert
Copy link
Contributor Author

Three failures:

Capture d’écran 2023-02-26 à 17 17 31

I do not think they are related.

@giordano giordano merged commit 6905c8e into JuliaLang:master Feb 26, 2023
@giordano
Copy link
Contributor

I restarted the macOS job, second time worked like a charm. FreeBSD and PowerPC are known to have problems (and for this reason they are tier 2 or 3), and they are allowed to fail tests in CI, in fact they always fail. Thanks a lot for your work!

@fxcoudert fxcoudert deleted the libgit2 branch February 27, 2023 09:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
domain:building Build system, or building Julia or its dependencies external dependencies Involves LLVM, OpenBLAS, or other linked libraries libgit2 The libgit2 library or the LibGit2 stdlib module stdlib:JLLs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants