Skip to content

Commit 46eceb1

Browse files
Fix stale downstream test groups (#4760)
* Fix workflow tag concurrency checks Co-Authored-By: Chris Rackauckas <accounts@chrisrackauckas.com> * Propagate integration resolver failures Co-Authored-By: Chris Rackauckas <accounts@chrisrackauckas.com> * Fix stale downstream test groups Co-Authored-By: Chris Rackauckas <accounts@chrisrackauckas.com> --------- Co-authored-by: ChrisRackauckas-Claude <accounts@chrisrackauckas.com>
1 parent d28894b commit 46eceb1

2 files changed

Lines changed: 19 additions & 38 deletions

File tree

.github/workflows/Downstream.yml

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@ jobs:
3737
- {user: SciML, repo: SBMLToolkit.jl, group: All, subpkg: ""}
3838
- {user: SciML, repo: NeuralPDE.jl, group: NNPDE1, subpkg: ""}
3939
- {user: SciML, repo: NeuralPDE.jl, group: NNPDE2, subpkg: ""}
40-
- {user: SciML, repo: DataDrivenDiffEq.jl, group: Downstream, subpkg: ""}
40+
- {user: SciML, repo: DataDrivenDiffEq.jl, group: Core, subpkg: ""}
4141
- {user: SciML, repo: StructuralIdentifiability.jl, group: Core, subpkg: ""}
4242
- {user: SciML, repo: ModelingToolkitStandardLibrary.jl, group: Core, subpkg: ""}
4343
- {user: SciML, repo: ModelOrderReduction.jl, group: Core, subpkg: ""}
44-
- {user: SciML, repo: MethodOfLines.jl, group: Interface, subpkg: ""}
44+
- {user: SciML, repo: MethodOfLines.jl, group: MOL_Interface1, subpkg: ""}
45+
- {user: SciML, repo: MethodOfLines.jl, group: MOL_Interface2, subpkg: ""}
4546
- {user: SciML, repo: MethodOfLines.jl, group: 2D_Diffusion, subpkg: ""}
4647
- {user: SciML, repo: MethodOfLines.jl, group: DAE, subpkg: ""}
4748
- {user: SciML, repo: ModelingToolkitNeuralNets.jl, group: Core, subpkg: ""}
@@ -63,27 +64,17 @@ jobs:
6364
shell: julia --color=yes --project=downstream {0}
6465
run: |
6566
using Pkg
66-
try
67-
# force it to use this PR's version of the package
68-
Pkg.develop(PackageSpec(path="./lib/ModelingToolkitBase")) # resolver may fail with main deps
69-
Pkg.develop(PackageSpec(path=".")) # resolver may fail with main deps
70-
subpkg = "${{ matrix.package.subpkg }}"
71-
if subpkg != ""
72-
Pkg.develop(PackageSpec(path=joinpath("./downstream/lib", subpkg)))
73-
end
74-
Pkg.update()
75-
if subpkg != ""
76-
Pkg.test(subpkg)
77-
else
78-
Pkg.test(coverage=true) # resolver may fail with test time deps
79-
end
80-
catch err
81-
err isa Pkg.Resolve.ResolverError || rethrow()
82-
# If we can't resolve that means this is incompatible by SemVer and this is fine
83-
# It means we marked this as a breaking change, so we don't need to worry about
84-
# Mistakenly introducing a breaking change, as we have intentionally made one
85-
@info "Not compatible with this release. No problem." exception=err
86-
exit(0) # Exit immediately, as a success
67+
Pkg.develop(PackageSpec(path="./lib/ModelingToolkitBase"))
68+
Pkg.develop(PackageSpec(path="."))
69+
subpkg = "${{ matrix.package.subpkg }}"
70+
if subpkg != ""
71+
Pkg.develop(PackageSpec(path=joinpath("./downstream/lib", subpkg)))
72+
end
73+
Pkg.update()
74+
if subpkg != ""
75+
Pkg.test(subpkg)
76+
else
77+
Pkg.test(coverage=true)
8778
end
8879
- uses: julia-actions/julia-processcoverage@v1
8980
- uses: codecov/codecov-action@v7

.github/workflows/ReleaseTest.yml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,11 @@ jobs:
4444
shell: julia --color=yes --project=downstream {0}
4545
run: |
4646
using Pkg
47-
try
48-
Pkg.activate("downstream")
49-
# force it to use this PR's version of the package
50-
Pkg.develop(PackageSpec(path=".")) # resolver may fail with main deps
51-
Pkg.add("${{ matrix.package.package }}")
52-
Pkg.update()
53-
Pkg.test("${{ matrix.package.package }}"; coverage=true) # resolver may fail with test time deps
54-
catch err
55-
err isa Pkg.Resolve.ResolverError || rethrow()
56-
# If we can't resolve that means this is incompatible by SemVer and this is fine
57-
# It means we marked this as a breaking change, so we don't need to worry about
58-
# Mistakenly introducing a breaking change, as we have intentionally made one
59-
@info "Not compatible with this release. No problem." exception=err
60-
exit(0) # Exit immediately, as a success
61-
end
47+
Pkg.activate("downstream")
48+
Pkg.develop(PackageSpec(path="."))
49+
Pkg.add("${{ matrix.package.package }}")
50+
Pkg.update()
51+
Pkg.test("${{ matrix.package.package }}"; coverage=true)
6252
- uses: julia-actions/julia-processcoverage@v1
6353
- uses: codecov/codecov-action@v7
6454
with:

0 commit comments

Comments
 (0)