From a6fc64c872171855da26fceb28a1d4b90b82ceb0 Mon Sep 17 00:00:00 2001 From: Kristoffer Date: Thu, 14 Nov 2024 15:07:09 +0100 Subject: [PATCH 1/3] try fix building non-incremental sysimages on nightly --- src/PackageCompiler.jl | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/PackageCompiler.jl b/src/PackageCompiler.jl index 07d7395f..545d3288 100644 --- a/src/PackageCompiler.jl +++ b/src/PackageCompiler.jl @@ -232,8 +232,14 @@ function create_fresh_base_sysimage(stdlibs::Vector{String}; cpu_target::String, # PR: https://github.com/JuliaLang/PackageCompiler.jl/pull/930 tmp_sys_sl = joinpath(tmp, "sys." * Libdl.dlext) - compiler_source_path = joinpath(base_dir, "compiler", "compiler.jl") + @static if VERSION >= v"1.12.0-DEV.1617" + compiler_source_path = joinpath(base_dir, "Base_compiler.jl") + compiler_args = `./` # build path + else + compiler_source_path = joinpath(base_dir, "compiler", "compiler.jl") + compiler_args = `` + end # we can't strip the IR from the base sysimg, so we filter out this flag # also presumably `--compile=all` and maybe a few others we missed here... sysimage_build_args_strs = map(p -> "$(p...)", values(sysimage_build_args)) @@ -246,7 +252,7 @@ function create_fresh_base_sysimage(stdlibs::Vector{String}; cpu_target::String, # Create corecompiler.ji cmd = `$(get_julia_cmd()) --cpu-target $cpu_target --output-ji $tmp_corecompiler_ji $sysimage_build_args - $compiler_source_path` + $compiler_source_path $compiler_args` @debug "running $cmd" read(cmd) @@ -263,7 +269,7 @@ function create_fresh_base_sysimage(stdlibs::Vector{String}; cpu_target::String, cmd = addenv(`$(get_julia_cmd()) --cpu-target $cpu_target --sysimage=$tmp_corecompiler_ji $sysimage_build_args --output-o=$tmp_sys_o - $new_sysimage_source_path`, + $new_sysimage_source_path $compiler_args`, "JULIA_LOAD_PATH" => "@stdlib") @debug "running $cmd" From 59a8c00295724fa8fa7f66e2eb95a0807351dbc6 Mon Sep 17 00:00:00 2001 From: KristofferC Date: Wed, 20 Nov 2024 14:08:52 +0100 Subject: [PATCH 2/3] update --- src/PackageCompiler.jl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/PackageCompiler.jl b/src/PackageCompiler.jl index 545d3288..220763b5 100644 --- a/src/PackageCompiler.jl +++ b/src/PackageCompiler.jl @@ -235,7 +235,9 @@ function create_fresh_base_sysimage(stdlibs::Vector{String}; cpu_target::String, @static if VERSION >= v"1.12.0-DEV.1617" compiler_source_path = joinpath(base_dir, "Base_compiler.jl") - compiler_args = `./` # build path + buildroot = "" + dataroot = relpath(joinpath(Sys.BINDIR, Base.DATAROOTDIR), base_dir) * "/" + compiler_args = `--buildroot $buildroot --dataroot $dataroot` # build path else compiler_source_path = joinpath(base_dir, "compiler", "compiler.jl") compiler_args = `` From b719aafb777d5666fc066e5d7bfe3d4b03c04b75 Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Wed, 20 Nov 2024 18:57:57 -0500 Subject: [PATCH 3/3] Increase some CI timeouts (#1003) --- .github/workflows/ci.nightly.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.nightly.yml b/.github/workflows/ci.nightly.yml index 6de72912..8ee865fd 100644 --- a/.github/workflows/ci.nightly.yml +++ b/.github/workflows/ci.nightly.yml @@ -17,7 +17,7 @@ concurrency: jobs: test-nightly: - timeout-minutes: 90 + timeout-minutes: 150 runs-on: ${{ matrix.github-runner }} strategy: max-parallel: 5 # leave space for other runs in the JuliaLang org, given these tests are long diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59aa1794..08cff4ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: steps: - run: exit 0 test: - timeout-minutes: 90 + timeout-minutes: 150 runs-on: ${{ matrix.github-runner }} strategy: max-parallel: 20 # leave space for other runs in the JuliaLang org, given these tests are long