Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More CI #250

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

More CI #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 14 additions & 12 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,35 @@ on:
- main
paths-ignore:
- 'docs/**'
schedule:
- cron: '41 10 * * 0'
jobs:
test:
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
group:
- All
- Core
version:
- '1'
os:
- ubuntu-latest
- macos-latest
- windows-latest
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.version }}
- uses: actions/cache@v3
env:
cache-name: cache-artifacts
- uses: julia-actions/cache@v1
with:
path: ~/.julia/artifacts
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
token: ${{ secrets.GITHUB_TOKEN }}
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
with:
depwarn: error
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v3
with:
file: lcov.info
file: lcov.info
3 changes: 2 additions & 1 deletion .github/workflows/Documentation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ on:
- main
tags: '*'
pull_request:

schedule:
- cron: '41 10 * * 0'
jobs:
build:
runs-on: ubuntu-latest
Expand Down
18 changes: 15 additions & 3 deletions .github/workflows/Downgrade.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,32 @@ on:
- main
paths-ignore:
- 'docs/**'
schedule:
- cron: '41 10 * * 0'
jobs:
test:
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
version: ['1']
group:
- Core
version:
- '1'
os:
- ubuntu-latest
- macos-latest
- windows-latest
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.version }}
- uses: cjdoris/julia-downgrade-compat-action@v1
# if: ${{ matrix.version == '1.6' }}
with:
skip: Pkg,TOML
- uses: julia-actions/cache@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
36 changes: 27 additions & 9 deletions .github/workflows/Downstream.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,55 @@

name: IntegrationTest
on:
push:
branches: [master]
tags: [v*]
pull_request:
branches:
- main
paths-ignore:
- 'docs/**'
push:
branches:
- main
tags:
- v*
paths-ignore:
- 'docs/**'
schedule:
- cron: '41 10 * * 0'

jobs:
test:
name: ${{ matrix.package.repo }}/${{ matrix.package.group }}/${{ matrix.julia-version }}
name: ${{ matrix.package.repo }}/${{ matrix.package.group }}/${{ matrix.version }}
runs-on: ${{ matrix.os }}
env:
GROUP: ${{ matrix.package.group }}
strategy:
fail-fast: false
matrix:
julia-version: [1]
os: [ubuntu-latest]
package:
- {user: SciML, repo: ModelingToolkit.jl}
- {user: SciML, repo: ModelingToolkit.jl, group: All}
version:
- '1'
os:
- ubuntu-latest
- macos-latest
- windows-latest
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.julia-version }}
version: ${{ matrix.version }}
arch: x64
- uses: julia-actions/cache@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
- uses: julia-actions/julia-buildpkg@latest
- name: Clone Downstream
uses: actions/checkout@v4
with:
repository: ${{ matrix.package.user }}/${{ matrix.package.repo }}
path: downstream
- name: Load this and run the downstream tests
shell: julia --color=yes --project=downstream {0}
shell: julia --color=yes --depwarn=error --project=downstream {0}
run: |
using Pkg
try
Expand Down
2 changes: 1 addition & 1 deletion test/Electrical/analog.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ _damped_sine_wave(x, f, A, st, ϕ, d) = exp((st - x) * d) * A * sin(2 * π * f *

for i in 1:lastindex(sources)
source = sources[i]
@info "Testing Voltage with $(source.name) source"
@info "Testing Voltage with $(source.get_name) source"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works:

Suggested change
@info "Testing Voltage with $(source.get_name) source"
@info "Testing Voltage with $(ModelingToolkit.getname(source)) source"

Better still - a using ModelingToolkit: getname at the top and $(getname(source)) here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This just makes the change in a string naming the test. Not the actual code.

eqs = [connect(source.output, voltage.V)
connect(voltage.p, voltage_sensor.p, res.p)
connect(res.n, cap.p)
Expand Down
74 changes: 18 additions & 56 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,32 @@
using SafeTestsets

@safetestset "Quality Assurance" begin
include("qa.jl")
end
@time @safetestset "Quality Assurance" include("qa.jl")

# Blocks
@safetestset "Blocks: math" begin
include("Blocks/math.jl")
end
@safetestset "Blocks: nonlinear" begin
include("Blocks/nonlinear.jl")
end
@safetestset "Blocks: continuous" begin
include("Blocks/continuous.jl")
end
@safetestset "Blocks: sources" begin
include("Blocks/sources.jl")
end
@safetestset "Blocks: analysis points" begin
include("Blocks/test_analysis_points.jl")
end
@time @safetestset "Blocks: math" include("Blocks/math.jl")
@time @safetestset "Blocks: nonlinear" include("Blocks/nonlinear.jl")
@time @safetestset "Blocks: continuous" include("Blocks/continuous.jl")
@time @safetestset "Blocks: sources" include("Blocks/sources.jl")
@time @safetestset "Blocks: analysis points" include("Blocks/test_analysis_points.jl")

# Electrical
@safetestset "Analog Circuits" begin
include("Electrical/analog.jl")
end

@safetestset "Chua Circuit Demo" begin
include("chua_circuit.jl")
end

@safetestset "Digital Circuits" begin
include("Electrical/digital.jl")
end
@safetestset "Chua Circuit Demo" begin
include("chua_circuit.jl")
end
@time @safetestset "Analog Circuits" include("Electrical/analog.jl")
@time @safetestset "Chua Circuit Demo" include("chua_circuit.jl")
@time @safetestset "Digital Circuits" include("Electrical/digital.jl")
@time @safetestset "Chua Circuit Demo" include("chua_circuit.jl")

# Thermal
@safetestset "Thermal Circuits" begin
include("Thermal/thermal.jl")
end
@safetestset "Thermal Demo" begin
include("Thermal/demo.jl")
end
@time @safetestset "Thermal Circuits" include("Thermal/thermal.jl")
@time @safetestset "Thermal Demo" include("Thermal/demo.jl")

# Magnetic
@safetestset "Magnetic" begin
include("Magnetic/magnetic.jl")
end
@time @safetestset "Magnetic" include("Magnetic/magnetic.jl")

# Mechanical
@safetestset "Mechanical Rotation" begin
include("Mechanical/rotational.jl")
end
@safetestset "Mechanical Translation" begin
include("Mechanical/translational.jl")
end
@safetestset "Mechanical Translation" begin
include("Mechanical/translational_modelica.jl")
end
@safetestset "Multi-Domain" begin
include("multi_domain.jl")
end
@time @safetestset "Mechanical Rotation" include("Mechanical/rotational.jl")
@time @safetestset "Mechanical Translation" include("Mechanical/translational.jl")
@time @safetestset "Mechanical Translation" include("Mechanical/translational_modelica.jl")
@time @safetestset "Multi-Domain" include("multi_domain.jl")

# Hydraulic
@safetestset "Hydraulic IsothermalCompressible" begin
include("Hydraulic/isothermal_compressible.jl")
end
@time @safetestset "Hydraulic IsothermalCompressible" include("Hydraulic/isothermal_compressible.jl")
Loading