From 3ca533c913c31d0972df560478bf2351a9e41a2c Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 4 Jun 2024 12:13:04 +0200
Subject: [PATCH] [ci] Use eigen unsupported in guix container builds.
---
scripts/ci/jobs/build-guix.yml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/ci/jobs/build-guix.yml b/scripts/ci/jobs/build-guix.yml
index c3983a51b9e..90eaad7d86c 100644
--- a/scripts/ci/jobs/build-guix.yml
+++ b/scripts/ci/jobs/build-guix.yml
@@ -45,15 +45,19 @@ deploy container:
script:
- which guix
- guix describe
+ - |
+ 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
# 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 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 | tee | tail -1 )
+ - 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
# Copy petsc image to eve as well
--
GitLab