Skip to content

Commit c319525

Browse files
authored
Merge pull request #148 from JuliaDiff/mz/1.6
Fix 1.6 CI
2 parents 5d823e1 + a13424d commit c319525

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

test/to_vec.jl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,11 @@ end
109109

110110
@testset "Tuples" begin
111111
test_to_vec((5, 4))
112-
test_to_vec((5, randn(T, 5)); check_inferred = VERSION v"1.2")
112+
# TODO remove "< 1.6" once https://github.com/JuliaLang/julia/issues/40277
113+
test_to_vec((5, randn(T, 5)); check_inferred = VERSION v"1.2" && VERSION < v"1.6")
113114
test_to_vec((randn(T, 4), randn(T, 4, 3, 2), 1); check_inferred = false)
114-
test_to_vec((5, randn(T, 4, 3, 2), UpperTriangular(randn(T, 4, 4)), 2.5); check_inferred = VERSION v"1.2")
115+
# TODO remove "< 1.6" once https://github.com/JuliaLang/julia/issues/40277
116+
test_to_vec((5, randn(T, 4, 3, 2), UpperTriangular(randn(T, 4, 4)), 2.5); check_inferred = VERSION v"1.2" && VERSION < v"1.6")
115117
test_to_vec(((6, 5), 3, randn(T, 3, 2, 0, 1)); check_inferred = false)
116118
test_to_vec((DummyType(randn(T, 2, 7)), DummyType(randn(T, 3, 9))))
117119
test_to_vec((DummyType(randn(T, 3, 2)), randn(T, 11, 8)))
@@ -157,7 +159,8 @@ end
157159

158160
@testset "Struct" begin
159161
test_to_vec(Composite{ThreeFields}(; a=10.0, b=20.0, c=30.0))
160-
test_to_vec(Composite{ThreeFields}(; a=10.0, b=20.0,))
162+
# TODO remove "< 1.6" once https://github.com/JuliaLang/julia/issues/40277
163+
test_to_vec(Composite{ThreeFields}(; a=10.0, b=20.0,), check_inferred = VERSION < v"1.6")
161164
test_to_vec(Composite{ThreeFields}(; a=10.0, c=30.0))
162165
test_to_vec(Composite{ThreeFields}(; c=30.0, a=10.0, b=20.0))
163166
end

0 commit comments

Comments
 (0)