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

Move JLLs to own folder #79064

Merged
merged 1 commit into from Apr 3, 2023
Merged

Conversation

oxinabox
Copy link
Contributor

@oxinabox oxinabox commented Mar 7, 2023

This implements @KristofferC 's idea from #78672 (comment)
and should (for now at least) close #78672

the script i used to do this is:

using Pkg: @pkg_str
pkg"activate --temp"
pkg"add Glob@1.3"

using Glob

mkpath.(joinpath.("jll", string.('A':'Z')))
paths = glob(glob"*/*_jll/") 
mv.(paths, joinpath.("jll", paths))

reg_file = read("Registry.toml", String)
new_reg_file = replace(reg_file, 
    r"path = \"(.*_jll)\""=> s"path = \"jll/\1\""
)
write("Registry.toml", new_reg_file)


run(`git add jll`)
run(`git commit -m "Move JLLs to own folder" -a`)
run(`git push --force-with-lease`)

@KristofferC
Copy link
Member

Nice, we'll have to ensure Registrator doesn't freak out by this (and it should also be updated to register new jlls in this subdir) but I think this is a good idea.

Copy link
Member

@staticfloat staticfloat left a comment

Choose a reason for hiding this comment

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

Sounds good to me!

@DilumAluthge
Copy link
Member

Nice, we'll have to ensure Registrator doesn't freak out by this (and it should also be updated to register new jlls in this subdir) but I think this is a good idea.

IIRC, Ygg uses RegistryTools to create the registration PRs (not Registrator), so we'd need to apply the changes there.

Copy link
Member

@DilumAluthge DilumAluthge left a comment

Choose a reason for hiding this comment

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

SGTM!

Let's make the necessary changes to RegistryTools before we merge this PR?

@oxinabox
Copy link
Contributor Author

oxinabox commented Mar 8, 2023

Can we merge this, or do we need to rebuild a manifest on some Yggdrasil bot?

@DilumAluthge
Copy link
Member

I think we need JuliaPackaging/BinaryBuilder.jl#1267

@oxinabox
Copy link
Contributor Author

oxinabox commented Mar 9, 2023

that was merged and then reverted.

Meanwhile this PR has gained conflicts.
I will again reset it to master then rerun the script to make the changes and force push back here. Easy enough

@GunnarFarneback
Copy link
Contributor

AutoMerge will be unhappy about new jll registrations unless RegistryCI is updated with the new RegistryTools version. But that's not compatible with Julia < 1.6 so JuliaRegistries/RegistryTools.jl#85 might need to be backported to a new RegistryTools 1.x release as well.

@DilumAluthge
Copy link
Member

I've released a new RegistryTools 2.2 that restores compatibility with Julia 1.1+.

We need to merge JuliaRegistries/RegistryCI.jl#500 and register RegistryCI 8.3.

Then we need to update the CI manifest in the General registry to use RegistryCI 8.3.

@oxinabox
Copy link
Contributor Author

oxinabox commented Mar 22, 2023

So current blocker is yggdrasil to the new registry tools?
Is anyone working on that?

@DilumAluthge
Copy link
Member

JuliaPackaging/BinaryBuilder.jl#1269

Someone need to review and merge that PR.

@oxinabox
Copy link
Contributor Author

oxinabox commented Mar 29, 2023

OK, I believe there should no longer be any blockers.
Is that correct?
and I have rebased, shall we merge this?

Copy link
Member

@DilumAluthge DilumAluthge left a comment

Choose a reason for hiding this comment

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

SGTM. Can you run the script again? And then we can quickly merge before more conflicts arise.

@oxinabox oxinabox force-pushed the ox/mv_jll branch 2 times, most recently from 3edc0b6 to 68cf30d Compare April 3, 2023 07:44
@DilumAluthge DilumAluthge merged commit 2ff71b4 into JuliaRegistries:master Apr 3, 2023
10 checks passed
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.

Time to start subdividing within letters S/o/SomePackage.jl etc
5 participants