Skip to content

Commit 5e3fd27

Browse files
committed
test against Trixi/main
1 parent b2d8e9c commit 5e3fd27

File tree

4 files changed

+2
-42
lines changed

4 files changed

+2
-42
lines changed

.github/workflows/Documenter.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,6 @@ jobs:
3939
PYTHON: ""
4040
- name: Install dependencies
4141
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
42-
# Workaround to test against specific PR (needs to be removed before merging)
43-
- name: Checkout Trixi version from PR
44-
uses: actions/checkout@v4
45-
with:
46-
repository: patrickersing/Trixi.jl
47-
ref: swe_separation
48-
path: docs/Trixi-PR
49-
- name: Load Trixi version from PR
50-
shell: julia --color=yes --project=docs/ {0}
51-
run: |
52-
using Pkg
53-
Pkg.develop(PackageSpec(path="docs/Trixi-PR"))
54-
Pkg.update()
55-
# end of workaround
5642
- name: Build and deploy
5743
env:
5844
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,6 @@ jobs:
7474
- run: julia -e 'using InteractiveUtils; versioninfo(verbose=true)'
7575
- uses: julia-actions/cache@v2
7676
- uses: julia-actions/julia-buildpkg@v1
77-
# Workaround to test against specific PR (needs to be removed before merging)
78-
- name: Checkout Trixi version from PR
79-
uses: actions/checkout@v4
80-
with:
81-
repository: patrickersing/Trixi.jl
82-
ref: swe_separation
83-
path: Trixi-PR
84-
- name: Load Trixi version from PR
85-
shell: julia --color=yes --project=@. {0}
86-
run: |
87-
using Pkg
88-
Pkg.develop(PackageSpec(path="Trixi-PR"))
89-
Pkg.update()
90-
# end of workaround
9177
- name: Run tests without coverage
9278
uses: julia-actions/julia-runtest@v1
9379
with:
@@ -128,20 +114,6 @@ jobs:
128114
- run: julia -e 'using InteractiveUtils; versioninfo(verbose=true)'
129115
- uses: julia-actions/cache@v2
130116
- uses: julia-actions/julia-buildpkg@v1
131-
# Workaround to test against specific PR (needs to be removed before merging)
132-
- name: Checkout Trixi version from PR
133-
uses: actions/checkout@v4
134-
with:
135-
repository: patrickersing/Trixi.jl
136-
ref: swe_separation
137-
path: Trixi-PR
138-
- name: Load Trixi version from PR
139-
shell: julia --color=yes --project=@. {0}
140-
run: |
141-
using Pkg
142-
Pkg.develop(PackageSpec(path="Trixi-PR"))
143-
Pkg.update()
144-
# end of workaround
145117
- name: Run tests with coverage
146118
uses: julia-actions/julia-runtest@v1
147119
with:

Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ Printf = "1"
1919
Roots = "2.1.6"
2020
Static = "1.1.1"
2121
StaticArrays = "1.9"
22+
Trixi = "0.12"
2223
julia = "1.10"

test/Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ OrdinaryDiffEqSSPRK = "1.2"
1414
Printf = "1"
1515
Roots = "2.1.6"
1616
Test = "1"
17+
Trixi = "0.12"
1718
TrixiBottomTopography = "0.1"
1819
TrixiTest = "0.1"

0 commit comments

Comments
 (0)