From f45965c1ed823d48e1078529b6b1d6fb2133b85e Mon Sep 17 00:00:00 2001 From: t-bltg Date: Wed, 1 Dec 2021 23:41:13 +0100 Subject: [PATCH] update precompile_includer --- .github/workflows/SnoopCompile.yml | 6 +++--- deps/SnoopCompile/snoop_bot_config.jl | 2 +- src/precompile_includer.jl | 10 ++++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/SnoopCompile.yml b/.github/workflows/SnoopCompile.yml index 092c79bf2..80c70d629 100644 --- a/.github/workflows/SnoopCompile.yml +++ b/.github/workflows/SnoopCompile.yml @@ -38,7 +38,7 @@ jobs: - name: Install dependencies run: | julia --project -e 'using Pkg; Pkg.instantiate()' - julia -e 'using Pkg; Pkg.add( PackageSpec(name = "CompileBot", version = "1") ); Pkg.develop(PackageSpec(; path=pwd())); using CompileBot; CompileBot.addtestdep()' + julia -e 'using Pkg; Pkg.add(PackageSpec(name="CompileBot", version="1")); Pkg.develop(PackageSpec(; path=pwd())); using CompileBot; CompileBot.addtestdep()' # TESTCMD - name: Default TESTCMD @@ -71,8 +71,8 @@ jobs: - name: CompileBot postprocess run: | - if ! grep -m1 -q 'format' artifact/src/precompile_includer.jl; then sed -i '1 i\#! format: off' artifact/src/precompile_includer.jl; fi - julia -e 'using Pkg; Pkg.add( PackageSpec(name = "CompileBot", version = "1") ); using CompileBot; CompileBot.postprocess()' + if ! grep -m1 -q 'format: off' artifact/src/precompile_includer.jl; then sed -i '1 i\#! format: off' artifact/src/precompile_includer.jl; fi + julia -e 'using Pkg; Pkg.add(PackageSpec(name="CompileBot", version="1")); using CompileBot; CompileBot.postprocess()' - name: Create Pull Request uses: peter-evans/create-pull-request@v3 diff --git a/deps/SnoopCompile/snoop_bot_config.jl b/deps/SnoopCompile/snoop_bot_config.jl index 2fdfde569..3fc44a4a7 100644 --- a/deps/SnoopCompile/snoop_bot_config.jl +++ b/deps/SnoopCompile/snoop_bot_config.jl @@ -3,5 +3,5 @@ using CompileBot botconfig = BotConfig( "Plots", version = [v"1.5", v"1.6", v"1.7"], # NOTE: keep in sync with .github/workflows/SnoopCompile.yml - # else_version = v"1.7", + # else_version = v"1.8", ) \ No newline at end of file diff --git a/src/precompile_includer.jl b/src/precompile_includer.jl index 468829953..6571c44b4 100644 --- a/src/precompile_includer.jl +++ b/src/precompile_includer.jl @@ -14,16 +14,22 @@ elseif !ismultios && !ismultiversion _precompile_() end else - @static if v"1.6.0-DEV" <= VERSION <= v"1.6.9" + @static if v"1.5.0-DEV" <= VERSION <= v"1.5.9" + @static if isfile(joinpath(@__DIR__, "../deps/SnoopCompile/precompile//1.5/precompile_Plots.jl")) + include("../deps/SnoopCompile/precompile//1.5/precompile_Plots.jl") + _precompile_() + end +elseif v"1.6.0-DEV" <= VERSION <= v"1.6.9" @static if isfile(joinpath(@__DIR__, "../deps/SnoopCompile/precompile//1.6/precompile_Plots.jl")) include("../deps/SnoopCompile/precompile//1.6/precompile_Plots.jl") _precompile_() end -else +elseif v"1.7.0-DEV" <= VERSION <= v"1.7.9" @static if isfile(joinpath(@__DIR__, "../deps/SnoopCompile/precompile//1.7/precompile_Plots.jl")) include("../deps/SnoopCompile/precompile//1.7/precompile_Plots.jl") _precompile_() end +else end end # precompile_enclosure