From 7ddd2ed04da1ae3a1bd601707d76927f2a83c6d3 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Mon, 15 Jul 2024 10:34:00 +0200 Subject: [PATCH 1/3] [ci] Update guix to have /tmp available in containers. See https://issues.guix.gnu.org/71552. apptainer exec --bind /tmp:/tmp ... is not required anymore. --- scripts/guix/channels.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/guix/channels.scm b/scripts/guix/channels.scm index a5cfef1328e..b3d064b2448 100644 --- a/scripts/guix/channels.scm +++ b/scripts/guix/channels.scm @@ -8,7 +8,7 @@ (url "https://git.savannah.gnu.org/git/guix.git") (branch "master") (commit - "78b881722f08325c76096557313a0faee847c66f") + "7893b32ef6ec85d51f082681a9f4fa911867afba") (introduction (make-channel-introduction "cdf1d7dded027019f0ebbd5d6f0147b13dfdd28d" From ec2b605ef7a457805bf1fe7332eae3a3e8c1f11d Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Mon, 15 Jul 2024 11:32:14 +0200 Subject: [PATCH 2/3] [ci,guix] Fix typo. --- scripts/ci/jobs/build-guix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/jobs/build-guix.yml b/scripts/ci/jobs/build-guix.yml index 89dd8d9577e..382507a6346 100644 --- a/scripts/ci/jobs/build-guix.yml +++ b/scripts/ci/jobs/build-guix.yml @@ -23,7 +23,7 @@ build guix: # SteadyStateDiffusion only! - | if [[ "$CI_MERGE_REQUEST_LABELS" =~ .*ci::guix\ only.* ]]; then - guix time-machine -C scripts/guix/channels.scm -- build ogs-serial --with-source=ogs=$PWD + guix time-machine -C scripts/guix/channels.scm -- build ogs-serial --with-source=ogs-serial=$PWD guix time-machine -C scripts/guix/channels.scm -- build ogs-petsc --with-source=ogs-petsc=$PWD else guix time-machine -C scripts/guix/channels.scm -- build ogs-ssd --with-source=ogs-ssd=$PWD From ea7286b7eb5e5dd85479b41a2316d1d2873416c6 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Mon, 15 Jul 2024 11:32:30 +0200 Subject: [PATCH 3/3] [ci,guix] vtk 9.3 is now in upstream. https://issues.guix.gnu.org/70323 --- scripts/ci/jobs/build-guix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/jobs/build-guix.yml b/scripts/ci/jobs/build-guix.yml index 382507a6346..4ef2bef9959 100644 --- a/scripts/ci/jobs/build-guix.yml +++ b/scripts/ci/jobs/build-guix.yml @@ -48,7 +48,7 @@ deploy container: - guix describe - | if [[ "$GUIX_PACKAGE" =~ .*-mkl ]]; then - GUIX_ARGS="--with-commit=eigen=9000b3767770f6dd0f4cfb12f4e19c71921885a4 --without-tests=eigen --with-configure-flag=vtk=-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=OFF --with-source=vtk=https://github.com/Kitware/VTK/archive/refs/tags/v9.3.0.tar.gz" + GUIX_ARGS="--with-commit=eigen=9000b3767770f6dd0f4cfb12f4e19c71921885a4 --without-tests=eigen --with-configure-flag=vtk=-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=OFF" fi # Add openmpi package for mpirun if [[ "$GUIX_PACKAGE" =~ .*petsc.* ]]; then