Skip to content

Commit a58c9c1

Browse files
authored
Resume CI on Julia 1.9, but only 64-bit (skip 32-bit); also, skip the LLVMExtra_jll-related tests on Julia 1.9 (#979)
1 parent 85cdb03 commit a58c9c1

File tree

3 files changed

+23
-13
lines changed

3 files changed

+23
-13
lines changed

.github/workflows/ci.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
matrix:
4848
julia-version:
4949
- '1.6' # previous LTS
50-
# - '1.9' # TODO: uncomment this line once we fix the tests on 1.9
50+
- '1.9'
5151
- '1.10' # current LTS
5252
- '1.11'
5353
# - 'nightly' # TODO: decide whether we want to run any CI jobs on nightly.
@@ -66,6 +66,10 @@ jobs:
6666
- 'true'
6767
- 'false' # needed for Julia 1.9+ to test from a session using pkgimages
6868
exclude:
69+
# For now, we'll disable testing 32-bit Julia 1.9 on all operating systems.
70+
# TODO: remove the following once we fix the tests for 32-bit Julia 1.9 .
71+
- julia-version: '1.9'
72+
julia-wordsize: '32'
6973
# For now, we'll disable testing 32-bit Julia 1.9 on Windows.
7074
# TODO: remove the following once we fix the tests for 32-bit Julia 1.9 on Windows.
7175
- github-runner: windows-latest

examples/MyApp/src/MyApp.jl

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ using HelloWorldC_jll
55
using Artifacts
66
using Distributed
77
using Random
8-
if VERSION >= v"1.7.0"
8+
9+
# We seem to get problems with LLVMExtra_jll on Julia 1.6 and 1.9
10+
# Issue for 1.6: https://github.com/JuliaLang/PackageCompiler.jl/issues/706
11+
# There's no GitHub Issue for 1.9
12+
@static if (VERSION.major, VERSION.minor) ((1, 6), (1, 9),)
913
using LLVMExtra_jll
1014
end
1115

@@ -85,7 +89,7 @@ function real_main()
8589
@eval @everywhere using Example
8690
@everywhere println(Example.domath(3))
8791

88-
if VERSION >= v"1.7.0"
92+
@static if (VERSION.major, VERSION.minor) ((1, 6), (1, 9),)
8993
if isfile(LLVMExtra_jll.libLLVMExtra_path)
9094
println("LLVMExtra path: ok!")
9195
else

test/runtests.jl

+12-10
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Base.init_depot_path()
1616
const is_ci = tryparse(Bool, get(ENV, "CI", "")) === true
1717
const is_slow_ci = is_ci && Sys.ARCH == :aarch64
1818
const is_julia_1_6 = VERSION.major == 1 && VERSION.minor == 6
19+
const is_julia_1_9 = VERSION.major == 1 && VERSION.minor == 9
1920
const is_julia_1_11 = VERSION.major == 1 && VERSION.minor == 11
2021

2122
if is_ci
@@ -26,12 +27,8 @@ if is_slow_ci
2627
@warn "This is \"slow CI\" (`is_ci && Sys.ARCH == :aarch64`). Some tests will be skipped or modified." Sys.ARCH
2728
end
2829

29-
if is_julia_1_6
30-
@warn "This is Julia 1.6. Some tests will be skipped or modified." VERSION
31-
end
32-
33-
if is_julia_1_11
34-
@warn "This is Julia 1.11. Some tests will be skipped or modified." VERSION
30+
if any([is_julia_1_6, is_julia_1_9, is_julia_1_11])
31+
@warn "This is Julia $(VERSION.major).$(VERSION.minor). Some tests will be skipped or modified." VERSION
3532
end
3633

3734
function remove_llvmextras(project_file)
@@ -86,7 +83,7 @@ end
8683
# On Julia 1.11, `incremental=false` is currently broken: https://github.com/JuliaLang/PackageCompiler.jl/issues/976
8784
# So, for now, we skip the `incremental=false` tests on Julia 1.11
8885
@warn "This is Julia 1.11; skipping incremental=false test due to known bug: https://github.com/JuliaLang/PackageCompiler.jl/issues/976"
89-
@test_broken false
86+
@test_skip false
9087
continue
9188
end
9289
filter_stdlibs = (is_slow_ci ? (true, ) : (true, false))
@@ -97,8 +94,9 @@ end
9794
@info "starting: create_app testset" incremental filter
9895
tmp_app_source_dir = joinpath(tmp, "MyApp")
9996
cp(app_source_dir, tmp_app_source_dir)
100-
if is_julia_1_6
101-
# Issue #706 "Cannot locate artifact 'LLVMExtra'" on 1.6 so remove
97+
if is_julia_1_6 || is_julia_1_9
98+
# Julia 1.6: Issue #706 "Cannot locate artifact 'LLVMExtra'" on 1.6 so remove.
99+
# Julia 1.9: There's no GitHub Issue, but it seems we hit a similar problem.
102100
remove_llvmextras(joinpath(tmp_app_source_dir, "Project.toml"))
103101
end
104102
try
@@ -154,7 +152,11 @@ end
154152
@test occursin("From worker 4:\t8", app_output)
155153
@test occursin("From worker 5:\t8", app_output)
156154

157-
if VERSION >= v"1.7-"
155+
if is_julia_1_6 || is_julia_1_9
156+
# Julia 1.6: Issue #706 "Cannot locate artifact 'LLVMExtra'" on 1.6 so remove.
157+
# Julia 1.9: There's no GitHub Issue, but it seems we hit a similar problem.
158+
@test_skip false
159+
else
158160
@test occursin("LLVMExtra path: ok!", app_output)
159161
end
160162
@test occursin("micromamba_jll path: ok!", app_output)

0 commit comments

Comments
 (0)