Switch to Base CI rootfs for building Julia.

Artifacts.toml

@@ -20,3 +20,11 @@ lazy = true
     [[debian.download]]
     sha256 = "072392d8635847de70665af512551038b04baca99b38e271d0eef1ea36d2833a"
     url = "https://github.com/JuliaCI/PkgEval.jl/releases/download/v0.1/debian-bullseye-20220818.tar.xz"
+
+[package_linux]
+git-tree-sha1 = "1f829834cb7dfbfff7068892af39608ff6112c28"
+lazy = true
+
+    [[package_linux.download]]
+    sha256 = "39db1a3e1ef8b624daea4e7f3f0355e249043de960e16a1988cb96ed9ef725fc"
+    url = "https://github.com/JuliaCI/rootfs-images/releases/download/v5.30/package_linux.x86_64.tar.gz"

src/evaluate.jl

@@ -43,7 +43,7 @@ const compiled_cache = Dict()
 function get_compilecache(config::Configuration)
     lock(compiled_lock) do
         key = (config.julia, config.buildflags,
-               config.distro, config.uid, config.user, config.gid, config.group, config.home)
+               config.rootfs, config.uid, config.user, config.gid, config.group, config.home)
         dir = get(compiled_cache, key, nothing)
         if dir === nothing || !isdir(dir)
             compiled_cache[key] = mktempdir()
@@ -520,7 +520,7 @@ function evaluate_compiled_test(config::Configuration, pkg::Package; kwargs...)
         rr = false,
         # discover package relocatability issues by compiling in a different environment
         julia_install_dir="/usr/local/julia",
-        distro="arch",
+        rootfs="arch",
         user="user",
         group="group",
         home="/home/user",

src/julia.jl

@@ -156,7 +156,7 @@ function build_julia(_repo_path::String, config::Configuration)
 
     # build and install Julia
     install_dir = mktempdir()
-    build_config = Configuration(; xvfb=false)
+    build_config = Configuration(; rootfs="package_linux", xvfb=false)
     mounts = Dict(
         "/source:rw"    => repo_path,
         "/install:rw"   => install_dir

src/rootfs.jl

@@ -3,7 +3,7 @@ using LazyArtifacts: @artifact_str
 lazy_artifact(x) = @artifact_str(x)
 
 function _create_rootfs(config::Configuration)
-    base = lazy_artifact(config.distro)
+    base = lazy_artifact(config.rootfs)
 
     # a bare rootfs isn't usable out-of-the-box
     derived = mktempdir()
@@ -34,7 +34,7 @@ const rootfs_lock = ReentrantLock()
 const rootfs_cache = Dict()
 function create_rootfs(config::Configuration)
     lock(rootfs_lock) do
-        key = (config.distro, config.uid, config.user, config.gid, config.group, config.home)
+        key = (config.rootfs, config.uid, config.user, config.gid, config.group, config.home)
         dir = get(rootfs_cache, key, nothing)
         if dir === nothing || !isdir(dir)
             rootfs_cache[key] = _create_rootfs(config)

src/types.jl

@@ -38,7 +38,7 @@ Base.@kwdef struct Configuration
     registry::Setting{String} = Default("master")
 
     # rootfs properties
-    distro::Setting{String} = Default("debian")
+    rootfs::Setting{String} = Default("debian")
     uid::Setting{Int} = Default(1000)
     user::Setting{String} = Default("pkgeval")
     gid::Setting{Int} = Default(1000)
@@ -81,7 +81,7 @@ function Base.show(io::IO, cfg::Configuration)
     println(io)
 
     println(io, "  # Rootfs properties")
-    show_setting.(["distro", "uid", "user", "gid", "group", "home"])
+    show_setting.(["rootfs", "uid", "user", "gid", "group", "home"])
     println(io)
 
     println(io, "  # Execution properties")