Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support Julia 1.11+ #113

Merged
merged 14 commits into from
May 22, 2024
Merged

Support Julia 1.11+ #113

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a33a464
Update sandbox for Julia 1.11
omus May 21, 2024
a996d9a
Update test for Julia 1.11
omus May 21, 2024
c3964c1
fixup! Update test for Julia 1.11
omus May 21, 2024
faff47f
Nightly failures are no longer silent
omus May 22, 2024
794d812
Use GHA supporting Node 20
omus May 22, 2024
97c2c06
fixup! Update sandbox for Julia 1.11
omus May 22, 2024
cb7a15d
drop! Ensure we didn't break anything
omus May 22, 2024
c67cac2
Only was introduced in Julia 1.4
omus May 22, 2024
bfe6dcf
Fix tests on Julia 1.7/1.8
omus May 22, 2024
e2d1d57
fixup! Only was introduced in Julia 1.4
omus May 22, 2024
01a52e9
fixup! Fix tests on Julia 1.7/1.8
omus May 22, 2024
1c4f6dc
Revert "drop! Ensure we didn't break anything"
omus May 22, 2024
c82d141
Revert reporttests.jl changes
omus May 22, 2024
38a8071
Merge branch 'master' into cv/nightly-fix
omus May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions src/runner.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,27 +380,26 @@ function test!(pkg::AbstractString,
cmd = gen_command(runner_code, julia_args, coverage)
test_folder_has_project_file = has_test_project_file(testfilepath)

if VERSION >= v"1.4.0" || (VERSION >= v"1.2.0" && test_folder_has_project_file)
if VERSION >= v"1.4" || (VERSION >= v"1.2" && test_folder_has_project_file)
# Operations.sandbox() has different arguments between versions
sandbox_args = (ctx,
pkgspec,
pkgspec.path,
joinpath(pkgspec.path, "test"))
if VERSION >= v"1.8.0"
test_project_override = test_folder_has_project_file ?
nothing :
test_project_override = if VERSION >= v"1.4" && !test_folder_has_project_file
if VERSION >= v"1.8"
gen_target_project(ctx, pkgspec, pkgspec.path::String, "test")
sandbox_args = (sandbox_args..., test_project_override)
elseif VERSION >= v"1.7.0"
test_project_override = test_folder_has_project_file ?
nothing :
elseif VERSION >= v"1.7"
gen_target_project(ctx.env, ctx.registries, pkgspec, pkgspec.path, "test")
sandbox_args = (sandbox_args..., test_project_override)
elseif VERSION >= v"1.4.0"
test_project_override = test_folder_has_project_file ?
nothing :
else
gen_target_project(ctx, pkgspec, pkgspec.path, "test")
sandbox_args = (sandbox_args..., test_project_override)
end
else
nothing
end
Comment on lines -398 to +408
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff is hard to read but this part is just dealing with version differences for calling gen_target_project independently from sandbox args


sandbox_args = if VERSION >= v"1.11.0-"
(ctx, pkgspec, joinpath(pkgspec.path, "test"), test_project_override)
elseif VERSION >= v"1.4.0"
(ctx, pkgspec, pkgspec.path, joinpath(pkgspec.path, "test"), test_project_override)
else
(ctx, pkgspec, pkgspec.path, joinpath(pkgspec.path, "test"))
end

sandbox(sandbox_args...) do
Expand Down
0 test/references/complexexample.txt → test/references/complexexample_pre_1_11.txt
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion test/reportgeneration.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ const TEST_PKG = (name = "Example", uuid = UUID("7876af07-990d-54b4-ab0e-2369062
end

@testset "Complex Example" begin
test_file = if VERSION >= v"1.9.0-beta4.29" # https://github.com/JuliaLang/julia/pull/48526
test_file = if VERSION >= v"1.11-"
"references/complexexample.txt"
elseif VERSION >= v"1.9.0-beta4.29" # https://github.com/JuliaLang/julia/pull/48526
"references/complexexample_pre_1_11.txt"
elseif VERSION >= v"1.7.0"
"references/complexexample_pre_1_9.txt"
else
Expand Down
Loading