Skip to content

Commit

Permalink
Merge branch 'container-tmp' into 'master'
Browse files Browse the repository at this point in the history
[ci] Update guix to have /tmp available in containers.

See merge request ogs/ogs!5047
  • Loading branch information
bilke committed Jul 15, 2024
2 parents 2d21bc6 + ea7286b commit 6a2e22b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions scripts/ci/jobs/build-guix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/guix/channels.scm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
(url "https://git.savannah.gnu.org/git/guix.git")
(branch "master")
(commit
"78b881722f08325c76096557313a0faee847c66f")
"7893b32ef6ec85d51f082681a9f4fa911867afba")
(introduction
(make-channel-introduction
"cdf1d7dded027019f0ebbd5d6f0147b13dfdd28d"
Expand Down

0 comments on commit 6a2e22b

Please sign in to comment.