diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 74a1a5ad..a6d0a9ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,11 +51,12 @@ jobs: julia-version: - '1.10' # current LTS - '1.11' # current stable + # # 'pre' will install the latest prerelease build (RCs, betas, and alphas). # Uncomment this line when there is an active prerelease available. # Comment this line out when there is no prerelease available (to save CI time). - # - 'pre' + - 'pre' # # Note: we have a separate workflow (.github/workflows/ci.nightly.yml) # for Julia nightly. diff --git a/src/embedding_wrapper.c b/src/embedding_wrapper.c index 3080ee81..e74dbe2f 100644 --- a/src/embedding_wrapper.c +++ b/src/embedding_wrapper.c @@ -120,7 +120,10 @@ int main(int argc, char *argv[]) { jl_value_t *firstarg = checked_eval_string("popfirst!(ARGS)"); JL_GC_PUSH1(&firstarg); jl_sym_t *var = jl_symbol("PROGRAM_FILE"); -#if JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 11 +#if JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 12 + jl_binding_t *bp = jl_get_binding_wr(jl_base_module, var); + jl_checked_assignment(bp, jl_base_module, var, firstarg); +#elif JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 11 jl_binding_t *bp = jl_get_binding_wr(jl_base_module, var, /* alloc */ 1); jl_checked_assignment(bp, jl_base_module, var, firstarg); #elif JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 10 diff --git a/src/julia_init.c b/src/julia_init.c index d35761fe..d598f90b 100644 --- a/src/julia_init.c +++ b/src/julia_init.c @@ -69,9 +69,12 @@ void init_julia(int argc, char **argv) { char *root_dir = dirname(dirname(_sysimage_path)); set_depot_load_path(root_dir); free(_sysimage_path); - jl_options.image_file = sysimage_path; +#if JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR <= 11 julia_init(JL_IMAGE_CWD); +#else + jl_init_with_image_file(NULL, sysimage_path); +#endif } void shutdown_julia(int retcode) { jl_atexit_hook(retcode); } diff --git a/src/library_selection.jl b/src/library_selection.jl index 54b1df3d..bb989608 100644 --- a/src/library_selection.jl +++ b/src/library_selection.jl @@ -9,6 +9,7 @@ const jll_mapping = Dict( "nghttp2_jll" => ["libnghttp2"], "LibGit2_jll" => ["libgit2"], "SuiteSparse_jll" => ["libamd", "libbtf", "libcamd", "libccolamd", "libcholmod", "libcolamd", "libklu", "libldl", "librbio", "libspqr", "libsuitesparseconfig", "libumfpack"], + "OpenSSL_jll" => ["libcrypto", "libssl"], ) # Manually fixup of libLLVM