Skip to content

Commit

Permalink
Merge 3767281 into 972aaa0
Browse files Browse the repository at this point in the history
  • Loading branch information
benegee committed Jun 14, 2024
2 parents 972aaa0 + 3767281 commit 3bcac07
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 12 additions & 9 deletions utils/libtrixi-init-julia
Original file line number Diff line number Diff line change
Expand Up @@ -335,15 +335,10 @@ 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
# Install Trixi.jl and OrdinaryDiffEq.jl first
# Rationale: By first installing Trixi.jl, we ensure that we use its latest version,
# even if it does not play nicely with the latest version of OrdinaryDiffEq.jl.
# xref: https://github.com/trixi-framework/libtrixi/issues/190
echo "Install Trixi.jl and OrdinaryDiffEq.jl..."
JULIA_DEPOT_PATH="$julia_depot" JULIA_PKG_PRECOMPILE_AUTO=0 \
$julia_exec --project=. \
Expand All @@ -354,6 +349,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 ..."
Expand Down

0 comments on commit 3bcac07

Please sign in to comment.