Skip to content
This repository has been archived by the owner on Oct 23, 2022. It is now read-only.

Add Julia 1.6, 1.7 to tests #61

Merged
merged 5 commits into from
Mar 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: ['1.5']
version: ['1.5', '1.6', 'nightly']
os: [ubuntu-18.04, windows-latest]
arch: [x64]
include:
Expand All @@ -33,6 +33,9 @@ jobs:
"C:\Program Files\7-Zip\7z.exe" x mesa.7z
mklink opengl32.dll "x64\opengl32.dll"
mklink libglapi.dll "x64\libglapi.dll"
- name: Install GR dependencies (Linux only)
if: runner.os == 'Linux'
run: sudo apt install libxt6 libxrender1 libxext6 libgl1-mesa-glx libqt5widgets5
- uses: actions/cache@v2
env:
cache-name: cache-artifacts
Expand Down
2 changes: 1 addition & 1 deletion test/testsets/JuliaLang.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ and pop it from the set
# for some weird reason the unbound args check seems to fail for some (seemingly random) methods with Vararg arguments
methods_to_ignore = Dict(
OpticSim => VERSION >= v"1.6.0-DEV" ? [
(OpticSim.LensAssembly, Tuple{Vararg{Union{CSGTree{T},LensAssembly{T},Surface{T}},N} where N} where {T<:Real}),
(OpticSim.LensAssembly, Tuple{Vararg{Union{CSGTree{T},LensAssembly{T},OpticSim.Surface{T}},N} where N} where {T<:Real}),
(OpticSim.RayListSource, Tuple{Vararg{OpticalRay{T,3},N} where N} where {T<:Real}),
(OpticSim.OpticalSourceGroup, Tuple{Vararg{OpticalRayGenerator{T},N} where N} where {T<:Real}),
(OpticSim.PixelSource, Tuple{Vararg{P,N} where N} where {P<:OpticalRayGenerator{T}} where {T<:Real}),
Expand Down