Fix 1.9 (#757)

Co-authored-by: Kristoffer Carlsson <[email protected]>
Closes #755

Author: IanButterworth

.github/workflows/test.yml

@@ -31,16 +31,28 @@ jobs:
           - ubuntu-latest
           - macOS-latest
           - windows-latest
+        coverage:
+          - 'true'
+          - 'false' # needed for 1.9+ to test from a session using pkgimages
         exclude:
           - os: macOS-latest
             julia-arch: x86
+          - julia-version: '1.6'
+            coverage: 'false'
+          - julia-version: '1.7'
+            coverage: 'false'
+          - julia-version: '1.8'
+            coverage: 'false'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: julia-actions/setup-julia@latest
         with:
           version: ${{ matrix.julia-version }}
+      - uses: julia-actions/cache@v1
       - uses: julia-actions/julia-runtest@latest
+        with:
+          coverage: ${{ matrix.coverage }}
       - uses: julia-actions/julia-processcoverage@latest
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v3
         with:
           file: lcov.info

src/PackageCompiler.jl

@@ -194,7 +194,11 @@ end
 function get_julia_cmd()
     julia_path = joinpath(Sys.BINDIR, Base.julia_exename())
     color = Base.have_color === nothing ? "auto" : Base.have_color ? "yes" : "no"
-    return `$julia_path --color=$color --startup-file=no`
+    if isdefined(Base, :Linking) # pkgimage support feature flag
+        `$julia_path --color=$color --startup-file=no --pkgimages=no`
+    else
+        `$julia_path --color=$color --startup-file=no`
+    end
 end
 
 
@@ -219,9 +223,16 @@ function create_fresh_base_sysimage(stdlibs::Vector{String}; cpu_target::String)
     TerminalSpinners.@spin spinner begin
         cd(base_dir) do
             # Create corecompiler.ji
-            cmd = `$(get_julia_cmd()) --cpu-target $cpu_target --output-ji $tmp_corecompiler_ji
-                                    -g0 -O0 $compiler_source_path`
-            @debug "running $cmd"
+            cmd = if isdefined(Base, :Linking) # pkgimages feature flag
+                cmd = `$(get_julia_cmd()) --output-ji $tmp_corecompiler_ji -g0 -O0 $compiler_source_path`
+                @debug "running $cmd" JULIA_CPU_TARGET = cpu_target
+                addenv(cmd, "JULIA_CPU_TARGET" => cpu_target)
+            else
+                cmd = `$(get_julia_cmd()) --cpu-target $cpu_target --output-ji $tmp_corecompiler_ji
+                                        -g0 -O0 $compiler_source_path`
+                @debug "running $cmd"
+                cmd
+            end
             read(cmd)
 
             # Use that to create sys.ji
@@ -230,10 +241,18 @@ function create_fresh_base_sysimage(stdlibs::Vector{String}; cpu_target::String)
             new_sysimage_source_path = joinpath(tmp, "sysimage_packagecompiler_$(uuid1()).jl")
             write(new_sysimage_source_path, new_sysimage_content)
             try
-                cmd = `$(get_julia_cmd()) --cpu-target $cpu_target
+                cmd = if isdefined(Base, :Linking) # pkgimages feature flag
+                    cmd = `$(get_julia_cmd()) --sysimage=$tmp_corecompiler_ji
+                                              -g1 -O0 --output-ji=$tmp_sys_ji $new_sysimage_source_path`
+                    @debug "running $cmd" JULIA_CPU_TARGET = cpu_target
+                    addenv(cmd, "JULIA_CPU_TARGET" => cpu_target)
+                else
+                    cmd = `$(get_julia_cmd()) --cpu-target $cpu_target
                                         --sysimage=$tmp_corecompiler_ji
                                         -g1 -O0 --output-ji=$tmp_sys_ji $new_sysimage_source_path`
-                @debug "running $cmd"
+                    @debug "running $cmd"
+                    cmd
+                end
                 read(cmd)
             finally
                 rm(new_sysimage_source_path; force=true)
@@ -249,6 +268,7 @@ function ensurecompiled(project, packages, sysimage)
     # TODO: Only precompile `packages` (should be available in Pkg 1.8)
     cmd = `$(get_julia_cmd()) --sysimage=$sysimage -e 'using Pkg; Pkg.precompile()'`
     splitter = Sys.iswindows() ? ';' : ':'
+    @debug "ensurecompiled: running $cmd" JULIA_LOAD_PATH = "$project$(splitter)@stdlib"
     cmd = addenv(cmd, "JULIA_LOAD_PATH" => "$project$(splitter)@stdlib")
     run(cmd)
     return
@@ -261,6 +281,7 @@ function run_precompilation_script(project::String, sysimg::String, precompile_f
     cmd = `$(get_julia_cmd()) --sysimage=$(sysimg) --compile=all --trace-compile=$tracefile $arg`
     # --project is not propagated well with Distributed, so use environment
     splitter = Sys.iswindows() ? ';' : ':'
+    @debug "run_precompilation_script: running $cmd" JULIA_LOAD_PATH = "$project$(splitter)@stdlib"
     cmd = addenv(cmd, "JULIA_LOAD_PATH" => "$project$(splitter)@stdlib")
     precompile_file === nothing || @info "PackageCompiler: Executing $(abspath(precompile_file)) => $(tracefile)"
     run(cmd)  # `Run` this command so that we'll display stdout from the user's script.
@@ -378,9 +399,17 @@ function create_sysimg_object_file(object_file::String,
     write(outputo_file, julia_code)
     # Read the input via stdin to avoid hitting the maximum command line limit
 
-    cmd = `$(get_julia_cmd()) --cpu-target=$cpu_target -O3 $sysimage_build_args
-                              --sysimage=$base_sysimage --project=$project --output-o=$(object_file) $outputo_file`
-    @debug "running $cmd"
+    cmd = if isdefined(Base, :Linking) # pkgimages feature flag
+        cmd = `$(get_julia_cmd()) -O3 $sysimage_build_args
+                                --sysimage=$base_sysimage --project=$project --output-o=$(object_file) $outputo_file`
+        @debug "running $cmd" JULIA_CPU_TARGET = cpu_target
+        addenv(cmd, "JULIA_CPU_TARGET" => cpu_target)
+    else
+        cmd = `$(get_julia_cmd()) --cpu-target=$cpu_target -O3 $sysimage_build_args
+                                --sysimage=$base_sysimage --project=$project --output-o=$(object_file) $outputo_file`
+        @debug "running $cmd"
+        cmd
+    end
     non = incremental ? "" : "non"
     spinner = TerminalSpinners.Spinner(msg = "PackageCompiler: compiling $(non)incremental system image")
     @monitor_oom TerminalSpinners.@spin spinner run(cmd)
@@ -560,6 +589,7 @@ function create_sysimage(packages::Union{Nothing, Symbol, Vector{String}, Vector
         cd(dirname(abspath(sysimage_path))) do
             sysimage_file = basename(sysimage_path)
             cmd = `install_name_tool -id @rpath/$(sysimage_file) $sysimage_file`
+            @debug "running $cmd"
             run(cmd)
         end
     end

test/runtests.jl

@@ -62,8 +62,10 @@ end
             filter_stdlibs = (false,)
         end
         @testset for filter in filter_stdlibs
+            @info "starting: create_app testset" incremental filter
             tmp_app_source_dir = joinpath(tmp, "MyApp")
             cp(app_source_dir, tmp_app_source_dir)
+            try
             create_app(tmp_app_source_dir, app_compiled_dir; incremental=incremental, force=true, filter_stdlibs=filter, include_lazy_artifacts=true,
                        precompile_execution_file=joinpath(app_source_dir, "precompile_app.jl"),
                        executables=["MyApp" => "julia_main",
@@ -72,11 +74,13 @@ end
                                     "Error" => "erroring",
                                     "Undefined" => "undefined",
                                     ])
+            finally
             rm(tmp_app_source_dir; recursive=true)
             # Get rid of some local state
-            rm(joinpath(new_depot, "packages"); recursive=true)
-            rm(joinpath(new_depot, "compiled"); recursive=true)
-            rm(joinpath(new_depot, "artifacts"); recursive=true)
+            rm(joinpath(new_depot, "packages"); recursive=true, force=true)
+            rm(joinpath(new_depot, "compiled"); recursive=true, force=true)
+            rm(joinpath(new_depot, "artifacts"); recursive=true, force=true)
+            end # try
             app_path(app_name) = abspath(app_compiled_dir, "bin", app_name * (Sys.iswindows() ? ".exe" : ""))
             app_output = read(`$(app_path("MyApp")) I get --args --julia-args --threads=3 --check-bounds=yes -O1`, String)
 
@@ -138,6 +142,7 @@ end
             str = String(take!(io))
             @test all(occursin(str), ["UndefVarError:", "undefined", "not defined"])
             @test p.exitcode == 1
+            @info "done: create_app testset" incremental filter
         end
     end
     end # testset