Fix CI on Julia nightly (#108)

JuliaContainerization · Dec 24, 2021 · bf7c13b · bf7c13b
1 parent d98259c
commit bf7c13b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/generate_install_packages.jl b/src/generate_install_packages.jl
@@ -37,7 +37,12 @@ function _generate_install_packages_content(config::Config)
         "Pkg.add(name)",
         "Pkg.test(name)",
         "end",
-        "Pkg.add(collect(values(Pkg.Types.stdlibs())))",
+        "if Base.VERSION >= v\"1.8-\"",
+        "stdlib_names = first.(collect(values(Pkg.Types.stdlibs())))",
+        "else",
+        "stdlib_names = collect(values(Pkg.Types.stdlibs()))",
+        "end",
+        "Pkg.add(stdlib_names)",
         "for (uuid, info) in Pkg.dependencies()",
         "Pkg.add(info.name)",
         "end",

diff --git a/src/generate_packagecompiler_run.jl b/src/generate_packagecompiler_run.jl
@@ -8,7 +8,11 @@ function _generate_packagecompiler_run_content(config::Config)
         "import Pkg",
 
         "all_stdlib_uuids = collect(keys(Pkg.Types.stdlibs()))",
+        "if Base.VERSION >= v\"1.8-\"",
+        "all_stdlib_names = first.(collect(values(Pkg.Types.stdlibs())))",
+        "else",
         "all_stdlib_names = collect(values(Pkg.Types.stdlibs()))",
+        "end",
 
         "pkgnames = Vector{String}(undef, 0)",
         "for (uuid, info) in Pkg.dependencies()",