@@ -46,20 +46,16 @@ jobs:
46
46
repository : ' CliMA/${{ matrix.package }}'
47
47
path : ${{ matrix.package }}
48
48
49
- # The test suite for ClimaTimesteppers depends on ClimaCore, not
50
- # ClimaTimesteppers itself. If we dev-ed ClimaCore in ClimaTimesteppers,
51
- # the aqua test would fail because we never use ClimaCore.
52
- - if : (matrix.package != 'ClimaTimesteppers.jl' && matrix.package != 'ClimaCoupler.jl')
49
+ # Some of the packages only use ClimaCore in the test suite, so dev-ing ClimaCore
50
+ # from the package itself would cause the aqua test to fail. Instead, we install
51
+ # TestEnv into the base environment, activate the test env for the downstream package,
52
+ # and dev ClimaCore before running the test suite from there.
53
+ - if : (matrix.package != 'ClimaCoupler.jl')
53
54
run : |
55
+ julia --color=yes -e 'using Pkg; Pkg.add("TestEnv")'
54
56
julia --color=yes --project=${{ matrix.package }} -e 'using Pkg; Pkg.instantiate()'
55
- julia --color=yes --project=${{ matrix.package }} -e 'using Pkg; Pkg.develop(; path = ".")'
56
- julia --color=yes --project=${{ matrix.package }} -e 'using Pkg; Pkg.test()'
57
-
58
- - if : matrix.package == 'ClimaTimesteppers.jl'
59
- run : |
60
- julia --color=yes --project=ClimaTimesteppers.jl/test -e 'using Pkg; Pkg.instantiate()'
61
- julia --color=yes --project=ClimaTimesteppers.jl/test -e 'using Pkg; Pkg.develop(; path = ".")'
62
- julia --color=yes --project=ClimaTimesteppers.jl/test ClimaTimesteppers.jl/test/runtests.jl
57
+ julia --color=yes --project=${{ matrix.package }} -e 'using TestEnv; TestEnv.activate();\
58
+ using Pkg; Pkg.develop(; path = "."); include("${{ matrix.package }}/test/runtests.jl")'
63
59
64
60
- if : matrix.package == 'ClimaCoupler.jl'
65
61
run : |
0 commit comments