Merge d99a91f into 972aaa0

trixi-framework · Jun 14, 2024 · cb0fffa · cb0fffa
2 parents 972aaa0 + d99a91f
commit cb0fffa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,13 +37,13 @@ jobs:
         julia_version:
           - '1.10'
         t8code_version:
-          - '1.4.1'
+          - '2.0.0'
         include:
           - os: ubuntu-latest
             test_type: package-compiler
             arch: x64
             julia_version: '1.9.3'  # 1.9.4: missing nghttp2 symbols in libcurl
-            t8code_version: '1.4.1'
+            t8code_version: '2.0.0'
     env:
       # Necessary for HDF5 to play nice with Julia
       LD_PRELOAD: /lib/x86_64-linux-gnu/libcurl.so.4

diff --git a/utils/libtrixi-init-julia b/utils/libtrixi-init-julia
@@ -335,14 +335,6 @@ fi
 [ $? -eq 0 ] || die "could not configure system HDF5 library for Julia"
 echo
 
-# Develop LibTrixi.jl
-echo "Install LibTrixi.jl..."
-JULIA_DEPOT_PATH="$julia_depot" JULIA_PKG_PRECOMPILE_AUTO=0 \
-    $julia_exec --project=. \
-    -e "using Pkg; Pkg.develop(path=\"$libtrixi_jl_path\")"
-[ $? -eq 0 ] || die "could not install LibTrixi.jl"
-echo
-
 # Install remaining dependencies
 echo "Install Trixi.jl and OrdinaryDiffEq.jl..."
 JULIA_DEPOT_PATH="$julia_depot" JULIA_PKG_PRECOMPILE_AUTO=0 \
@@ -354,6 +346,14 @@ Pkg.add([\"Trixi\", \"OrdinaryDiffEq\"])
 [ $? -eq 0 ] || die "could not install dependencies"
 echo
 
+# Develop LibTrixi.jl
+echo "Install LibTrixi.jl..."
+JULIA_DEPOT_PATH="$julia_depot" JULIA_PKG_PRECOMPILE_AUTO=0 \
+    $julia_exec --project=. \
+    -e "using Pkg; Pkg.develop(path=\"$libtrixi_jl_path\")"
+[ $? -eq 0 ] || die "could not install LibTrixi.jl"
+echo
+
 # Install and precompile everything
 if [ $SKIP_PRECOMPILE -ne 1 ]; then
   echo "Precompile all packages ..."