Skip to content

Commit eb9f41b

Browse files
authored
Prepare CI for 1.11 release (trixi-framework#599)
* set test up for 1.11 * Increase errors for 1.11 * Fix invalidations * Fix tests * Update ci.yml * revert * Update ci.yml
1 parent 2ccc340 commit eb9f41b

File tree

3 files changed

+33
-19
lines changed

3 files changed

+33
-19
lines changed

.github/workflows/Invalidations.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ jobs:
1818
steps:
1919
- uses: julia-actions/setup-julia@v2
2020
with:
21-
version: '1'
21+
# TODO: Is broken in 1.11 revert to 1 after fix
22+
version: '1.10'
2223
- uses: actions/checkout@v4
2324
- uses: julia-actions/julia-buildpkg@v1
2425
- uses: julia-actions/julia-invalidations@v1

.github/workflows/ci.yml

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ on:
2727
- 'docs/**'
2828
workflow_dispatch:
2929

30-
3130
# Cancel redundant CI tests automatically
3231
concurrency:
3332
group: ${{ github.workflow }}-${{ github.ref }}
@@ -38,35 +37,45 @@ jobs:
3837
name: Run Tests (Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }})
3938
runs-on: ubuntu-latest
4039
strategy:
41-
# Don't cancel all running jobs when one job fails
4240
fail-fast: false
4341
matrix:
44-
version:
45-
- '1.9'
46-
- '1'
47-
os:
48-
- ubuntu-latest
49-
arch:
50-
- x64
51-
include:
52-
# Also run tests on Windows and macOS-ARM, but only with the latest Julia version
53-
- version: '1'
54-
os: windows-latest
55-
arch: x64
56-
- version: '1'
57-
os: macos-14
58-
arch: arm64
42+
version:
43+
- '1.9'
44+
- '1.10'
45+
- '1'
46+
os:
47+
- ubuntu-latest
48+
arch:
49+
- x64
50+
include:
51+
# Also run tests on Windows and macOS-ARM, but only with the latest Julia version and 1.10
52+
- version: '1.10'
53+
os: windows-latest
54+
arch: x64
55+
- version: '1.10'
56+
os: macos-14
57+
arch: arm64
58+
- version: '1'
59+
os: windows-latest
60+
arch: x64
61+
- version: '1'
62+
os: macos-14
63+
arch: arm64
5964

6065
steps:
6166
- name: Check out project
6267
uses: actions/checkout@v4
68+
6369
- name: Set up Julia
6470
uses: julia-actions/setup-julia@v2
6571
with:
6672
version: ${{ matrix.version }}
73+
6774
- uses: julia-actions/cache@v2
75+
6876
- name: Build package
6977
uses: julia-actions/julia-buildpkg@v1
78+
7079
- name: Run unit tests
7180
uses: julia-actions/julia-runtest@v1
7281
with:
@@ -75,12 +84,14 @@ jobs:
7584
coverage: ${{ matrix.os == 'ubuntu-latest' && matrix.version == '1' }}
7685
env:
7786
TRIXIPARTICLES_TEST: unit
87+
7888
- name: Process coverage results
7989
# Only run coverage in one Job (Ubuntu and latest Julia version)
8090
if: matrix.os == 'ubuntu-latest' && matrix.version == '1'
8191
uses: julia-actions/julia-processcoverage@v1
8292
with:
8393
directories: src,test
94+
8495
- name: Upload coverage report to Codecov
8596
# Only run coverage in one Job (Ubuntu and latest Julia version)
8697
if: matrix.os == 'ubuntu-latest' && matrix.version == '1'
@@ -91,6 +102,7 @@ jobs:
91102
flags: unit
92103
env:
93104
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
105+
94106
- name: Run example tests
95107
uses: julia-actions/julia-runtest@v1
96108
with:

test/validation/validation.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,14 @@
4747
@test sol.retcode == ReturnCode.Success
4848
@test count_rhs_allocations(sol, semi) == 0
4949

50-
if VERSION >= v"1.10"
50+
if VERSION == v"1.10"
5151
@test isapprox(error_edac_P1, 0, atol=eps())
5252
@test isapprox(error_edac_P2, 0, atol=eps())
5353
@test isapprox(error_wcsph_P1, 0, atol=eps())
5454
@test isapprox(error_wcsph_P2, 0, atol=eps())
5555
else
5656
# 1.9 causes a large difference in the solution
57+
# TODO 1.11 requires a performance hotfix which will likely change these results again
5758
@test isapprox(error_edac_P1, 0, atol=4e-9)
5859
@test isapprox(error_edac_P2, 0, atol=3e-11)
5960
@test isapprox(error_wcsph_P1, 0, atol=26.3)

0 commit comments

Comments
 (0)