Merge branch 'main' into ab_lucas

trixi-framework · Jul 17, 2024 · 7f485e6 · 7f485e6
2 parents 84baaf5 + a8f03b7
commit 7f485e6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/.github/workflows/CompatHelper.yml b/.github/workflows/CompatHelper.yml
@@ -3,6 +3,9 @@ on:
   schedule:
     - cron: 0 0 * * *
   workflow_dispatch:
+permissions:
+  contents: write
+  pull-requests: write
 jobs:
   CompatHelper:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,16 +47,23 @@ jobs:
           arch: ${{ matrix.arch }}
           show-versioninfo: true
       - uses: julia-actions/cache@v2
-      - uses: julia-actions/julia-buildpkg@v1
+
       - name: Run tests
         uses: julia-actions/julia-runtest@v1
         with:
           coverage: true
-      - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v4
+
+      - name: Process Julia coverage data
+        uses: julia-actions/julia-processcoverage@v1
+
+      - name: Upload coverage data (Codecov)
+        uses: codecov/codecov-action@v4
         with:
           files: lcov.info
-      - uses: coverallsapp/github-action@master
+          token: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: Upload coverage data (Coveralls)
+        uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          path-to-lcov: ./lcov.info
+          file: ./lcov.info
diff --git a/Project.toml b/Project.toml
@@ -15,5 +15,5 @@ LinearAlgebra = "1"
 MuladdMacro = "0.2.2"
 Static = "0.8"
 StaticArrays = "1"
-Trixi = "0.7"
+Trixi = "0.7, 0.8"
 julia = "1.9"
diff --git a/docs/Project.toml b/docs/Project.toml
@@ -5,4 +5,4 @@ TrixiAtmo = "c9ed1054-d170-44a9-8ee2-d5566f5d1389"
 
 [compat]
 Documenter = "1.3"
-DocumenterInterLinks = "0.3.1"
+DocumenterInterLinks = "0.3.1, 1"