diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0d7e6fe30..57deaf5e8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -10,7 +10,7 @@ on: - 'ext/**' - 'test/runtests.jl' - 'test/core-test/**' - - 'test/ext-test/cairomakie_ext.jl' + - 'test/ext-test/cairomakie/**' - 'Project.toml' pull_request: branches: @@ -21,7 +21,7 @@ on: - 'ext/**' - 'test/runtests.jl' - 'test/core-test/**' - - 'test/ext-test/cairomakie_ext.jl' + - 'test/ext-test/cairomakie/**' - 'Project.toml' types: - opened diff --git a/Project.toml b/Project.toml index 8c3759cc3..e591de619 100644 --- a/Project.toml +++ b/Project.toml @@ -70,9 +70,8 @@ julia = "1.10" [extras] Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" -CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["Aqua", "CairoMakie", "JET", "Test"] +test = ["Aqua", "JET", "Test"] diff --git a/test/ext-test/cairomakie/Project.toml b/test/ext-test/cairomakie/Project.toml new file mode 100644 index 000000000..06b706a2f --- /dev/null +++ b/test/ext-test/cairomakie/Project.toml @@ -0,0 +1,6 @@ +[deps] +CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" +QuantumToolbox = "6c2fb7c5-b903-41d2-bc5e-5a7c320b9fab" + +[compat] +CairoMakie = "0.12" \ No newline at end of file diff --git a/test/ext-test/cairomakie_ext.jl b/test/ext-test/cairomakie/cairomakie_ext.jl similarity index 100% rename from test/ext-test/cairomakie_ext.jl rename to test/ext-test/cairomakie/cairomakie_ext.jl diff --git a/test/runtests.jl b/test/runtests.jl index 9081ad842..ca5c41670 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -46,13 +46,16 @@ if (GROUP == "All") || (GROUP == "Core") end end -if (GROUP == "All") || (GROUP == "CairoMakie_Ext") - using QuantumToolbox +if (GROUP == "CairoMakie_Ext")# || (GROUP == "All") + Pkg.activate("ext-test/cairomakie") + Pkg.develop(PackageSpec(path = dirname(@__DIR__))) + Pkg.instantiate() - (GROUP == "CairoMakie_Ext") && QuantumToolbox.about() + using QuantumToolbox + QuantumToolbox.about() # CarioMakie is imported in the following script - include(joinpath(testdir, "ext-test", "cairomakie_ext.jl")) + include(joinpath(testdir, "ext-test", "cairomakie", "cairomakie_ext.jl")) end if (GROUP == "CUDA_Ext")# || (GROUP == "All")