Add support for keeping juliaup channel arch

E.g., for bundling for i686 on x86_64.

Author: stemann

src/code_stripping.jl

@@ -355,9 +355,20 @@ function _process_project_env(;
     packagebundler_toml =
         isfile(packagebundler_file) ? TOML.parsefile(packagebundler_file) :
         Dict{String,Any}()
+    packagebundler_toml_juliaup = get(Dict{String,Any}, packagebundler_toml, "juliaup")
     julia_version = TOML.parsefile(manifest_toml)["julia_version"]
     julia_version =
-        get(get(Dict{String,Any}, packagebundler_toml, "juliaup"), "channel", julia_version)
+        get(packagebundler_toml_juliaup, "channel", julia_version)
+    if haskey(packagebundler_toml_juliaup, "channel")
+        packagebundler_toml = merge(packagebundler_toml, Dict(
+            "juliaup" => Dict(
+                "channel" => _juliaup_channel(packagebundler_toml_juliaup["channel"])
+            )
+        ))
+        open(joinpath(named_environment, "PackageBundler.toml"), "w") do io
+            TOML.print(io, packagebundler_toml)
+        end
+    end
 
     pkg_version_info = Dict()
     for (each_uuid, each_name) in stripped
@@ -749,7 +760,7 @@ function _process_multiplexers(
         exists = Sys.which(multiplexer)
         if !isnothing(exists)
             if multiplexer == "juliaup"
-                return `julia +$(julia_version)`
+                return `julia +$(_juliaup_channel(julia_version))`
             elseif multiplexer == "asdf"
                 return withenv("ASDF_JULIA_VERSION" => "$(julia_version)") do
                     path = readchomp(`asdf which julia`)
@@ -771,3 +782,11 @@ function _process_multiplexers(
         error("no multiplexers found: $(repr(multiplexers))")
     end
 end
+
+function _juliaup_channel(julia_version::Union{String,VersionNumber})
+    if Sys.ARCH != Symbol(readchomp(`uname -m`))
+        arch = if Sys.ARCH == :i686; :x86; elseif Sys.ARCH == :x86_64; :x64; else Sys.ARCH; end
+        return "$(julia_version)~$arch"
+    end
+    return julia_version
+end

src/utilities.jl

@@ -35,11 +35,12 @@ function instantiate(environments::String)
             )
 
             if !isnothing(Sys.which("juliaup"))
-                @info "Checking whether Julia '$julia_version' is installed, if not, installing it."
-                run(`juliaup add $julia_version`)
+                juliaup_channel = _juliaup_channel(julia_version)
+                @info "Checking whether Julia '$juliaup_channel' is installed, if not, installing it."
+                run(`juliaup add $juliaup_channel`)
                 withenv("JULIA_PKG_PRECOMPILE_AUTO" => 0) do
                     run(
-                        `julia +$(julia_version) --project=$each -e 'import Pkg; Pkg.instantiate()'`,
+                        `julia +$juliaup_channel --project=$each -e 'import Pkg; Pkg.instantiate()'`,
                     )
                 end
             elseif !isnothing(Sys.which("asdf"))