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

Backport nightly precompilation code to 1.10. #4107

Merged
merged 5 commits into from
Dec 13, 2024

Conversation

KristofferC
Copy link
Member

@KristofferC KristofferC commented Dec 5, 2024

First commit is just copy pasting from nightly. Second commit is actually tweaking it to work with 1.10.

Copy link
Member

@topolarity topolarity left a comment

Choose a reason for hiding this comment

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

Thanks @KristofferC - this is great to have

Can we also add a test for #4095 ?

is_trigger = in(pkg, direct_deps[ext])
is_extension = in(pkg, keys(ext_to_parent))
has_triggers = issubset(direct_deps[ext], indirect_deps[pkg])
ext_loadable_in_pkg[pkg] = !is_extension && has_triggers && !is_trigger
Copy link
Member

Choose a reason for hiding this comment

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

This needs to be the modified behavior that we backported to 1.10, which accounts for its different extension loading behavior:
https://github.com/JuliaLang/Pkg.jl/pull/4093/files#diff-a43f827629f8ae12bbcbb218a293d325afcdda3a7f3c7016e2292840bf29ed1cR1220-R1250

(You should be able to copy-paste it directly, I think)

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy pasted with depsmap -> direct_deps and exts -> ext_to_parent renames.

Copy link
Member

@topolarity topolarity Dec 6, 2024

Choose a reason for hiding this comment

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

Oh, you're backporting from master instead of 1.11 - That will make backports a little more annoying since I never backported that rename to 1.11

That might be best for long-term anyway, just wanted to mention it

src/precompilation.jl Outdated Show resolved Hide resolved
@KristofferC KristofferC force-pushed the kc/backport_precompile branch from 291b111 to f9d4007 Compare December 6, 2024 08:42
@KristofferC KristofferC force-pushed the kc/backport_precompile branch from f9d4007 to 8c86a8e Compare December 6, 2024 09:09
Copy link
Member

@topolarity topolarity left a comment

Choose a reason for hiding this comment

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

LGTM

It's a pretty large / risky backport, but given that we'll be maintaining 1.10 for a long time it seems worth it to me

@KristofferC KristofferC merged commit 407e140 into release-1.10 Dec 13, 2024
11 checks passed
@KristofferC KristofferC deleted the kc/backport_precompile branch December 13, 2024 12:25
@KristofferC
Copy link
Member Author

Let's get this onto a 1.10 backport branch so we can test it properly.

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.

2 participants