Merge branch 'main' into compathelper/new_version/2023-10-29-00-05-43…

…-451-04052874994

.github/workflows/ci.yml

@@ -59,13 +59,13 @@ jobs:
         env:
           PYTHON: ""
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: coverallsapp/github-action@master
+      - uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           flag-name: run-${{ matrix.version }}-${{ matrix.os }}-${{ matrix.arch }}
           parallel: true
           path-to-lcov: ./lcov.info
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: success() || failure() # upload artifacts even if tests have failed
         with:
           name: test-output-files-${{ matrix.version }}-${{ matrix.os }}-${{ matrix.arch }}
@@ -77,7 +77,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Coveralls Finished
-      uses: coverallsapp/github-action@master
+      uses: coverallsapp/github-action@v2
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         parallel-finished: true

Project.toml

@@ -1,7 +1,7 @@
 name = "Trixi2Vtk"
 uuid = "bc1476a1-1ca6-4cc3-950b-c312b255ff95"
 authors = ["Michael Schlottke-Lakemper <[email protected]>", "Hendrik Ranocha <[email protected]>"]
-version = "0.3.12-pre"
+version = "0.3.13-pre"
 
 [deps]
 Glob = "c27321d9-0574-5035-807b-f59d2c89b15c"
@@ -18,6 +18,6 @@ HDF5 = "0.14, 0.15, 0.16, 0.17"
 ProgressMeter = "1.3"
 StaticArrays = "0.12, 1.0"
 TimerOutputs = "0.5"
-Trixi = "0.5"
+Trixi = "0.5, 0.6"
 WriteVTK = "1.7"
 julia = "1.7"

test/Project.toml

@@ -10,5 +10,5 @@ Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb"
 Documenter = "0.27, 1"
 Downloads = "1"
 OrdinaryDiffEq = "6"
-ReadVTK = "0.1"
-Trixi = "0.5"
+ReadVTK = "0.1, 0.2"
+Trixi = "0.5, 0.6"

test/runtests.jl

@@ -1,7 +1,18 @@
 using Test
 
-@testset "Trixi2Vtk" begin
-  include("test_2d.jl")
-  include("test_3d.jl")
-  include("test_manual.jl")
+# We use the `TRIXI_TEST` environment variable to determine the subset of tests to execute.
+const TRIXI_TEST = get(ENV, "TRIXI_TEST", "all")
+
+@time @testset "Trixi2Vtk" begin
+  @time if TRIXI_TEST == "all" || TRIXI_TEST == "2d" || TRIXI_TEST == "upstream"
+    include("test_2d.jl")
+  end
+
+  @time if TRIXI_TEST == "all" || TRIXI_TEST == "3d" || TRIXI_TEST == "upstream"
+    include("test_3d.jl")
+  end
+
+  @time if TRIXI_TEST == "all" || TRIXI_TEST == "manual"
+    include("test_manual.jl")
+  end
 end