Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swap installation order of Trixi.jl and LibTrixi.jl #192

Merged
merged 9 commits into from
Jun 25, 2024
Merged

Swap installation order of Trixi.jl and LibTrixi.jl #192

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
838e46d
swap installation order of Trixi.jl and LibTrixi.jl
benegee Jun 13, 2024
d99a91f
bump t8code version to 2.0.0
benegee Jun 14, 2024
567f08d
Merge branch 'main' into bg/swap_installation_order
sloede Jun 14, 2024
3767281
Update utils/libtrixi-init-julia
benegee Jun 14, 2024
81efc23
Merge branch 'main' into bg/swap_installation_order
sloede Jun 17, 2024
f7268d0
nelementsglobal change in Trixi.jl
benegee Jun 17, 2024
116e216
Merge branch 'bg/swap_installation_order' of github.com:trixi-framewo…
benegee Jun 17, 2024
9dad64a
Bump Trixi.jl compat version
benegee Jun 25, 2024
a5cb439
Merge branch 'main' into bg/swap_installation_order
benegee Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
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
16 changes: 8 additions & 8 deletions utils/libtrixi-init-julia
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
sloede marked this conversation as resolved.
Show resolved Hide resolved

# Install remaining dependencies
benegee marked this conversation as resolved.
Show resolved Hide resolved
echo "Install Trixi.jl and OrdinaryDiffEq.jl..."
JULIA_DEPOT_PATH="$julia_depot" JULIA_PKG_PRECOMPILE_AUTO=0 \
Expand All @@ -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 ..."
Expand Down
Loading