From bf7c13beafd950943144489771437370eeceb0a6 Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Fri, 24 Dec 2021 03:16:12 -0500 Subject: [PATCH] Fix CI on Julia nightly (#108) --- src/generate_install_packages.jl | 7 ++++++- src/generate_packagecompiler_run.jl | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/generate_install_packages.jl b/src/generate_install_packages.jl index 1dcf039..423169b 100644 --- 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 index 6d35aa4..da0c933 100644 --- 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()",