Skip to content

Commit

Permalink
Merge branch 'guix-openmpi' into 'master'
Browse files Browse the repository at this point in the history
Add mpirun to container

See merge request ogs/ogs!5024
  • Loading branch information
TomFischer committed Jun 20, 2024
2 parents af0bac6 + 6d3980b commit 92a2bb5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion scripts/ci/jobs/build-guix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,17 @@ deploy container:
if [[ "$GUIX_PACKAGE" =~ .*-mkl ]]; then
GUIX_ARGS="--with-commit=eigen=9000b3767770f6dd0f4cfb12f4e19c71921885a4 --without-tests=eigen --with-configure-flag=vtk-9.3=-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=OFF"
fi
# Add openmpi package for mpirun
if [[ "$GUIX_PACKAGE" =~ .*petsc.* ]]; then
GUIX_ARGS="${GUIX_ARGS} openmpi"
fi
# Build phase, retry once if failed
- guix time-machine -C scripts/guix/channels.scm -- build bash coreutils
- if [ $? -ne 0 ]; then !!; fi
- guix time-machine -C scripts/guix/channels.scm -- build ${GUIX_PACKAGE} --with-source=${GUIX_PACKAGE}=$PWD ${GUIX_ARGS}
- if [ $? -ne 0 ]; then !!; fi
# Pack phase
- mcli alias set minio https://minio.ufz.de $MINIO_PUBLIC_ACCESS_KEY $MINIO_PUBLIC_SECRET_KEY
# Pack serial image
- image=$( guix time-machine -C scripts/guix/channels.scm -- pack -RR --format=squashfs bash coreutils ${GUIX_PACKAGE} --with-source=${GUIX_PACKAGE}=$PWD ${GUIX_ARGS} | tee | tail -1 )
- echo "Image (${GUIX_PACKAGE}) $image"
- mcli cp $image minio/ogs/public/container/ogs/master/${GUIX_PACKAGE}.squashfs
Expand Down
2 changes: 1 addition & 1 deletion web/content/releases/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ icon = "fab fa-windows"

[[head_downloads]]
name = "Latest container CLI"
url = "https://minio.ufz.de/ogs/public/container/ogs/master/ogs.squashfs"
url = "https://minio.ufz.de/ogs/public/container/ogs/master/ogs-serial.squashfs"
note = "Download and run .squashfs-file with [Singularity / Apptainer](/docs/userguide/basics/container/)"
icon = "far fa-container-storage"

Expand Down

0 comments on commit 92a2bb5

Please sign in to comment.