diff --git a/scripts/ci/jobs/build-guix.yml b/scripts/ci/jobs/build-guix.yml index c3983a51b9edfe08414ff4d3405602ca2534a65c..90eaad7d86c59df8deb38c82efdd99b28283c728 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